diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-06-25 18:23:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-25 18:23:30 -0700 |
| commit | 22c8e3a23afc6be45020cd3f8c92bcea783ce8fa (patch) | |
| tree | 83c888602bc4a5970b603f4de9937fbea6c3d140 /toolsrc/src/vcpkg.cpp | |
| parent | f10c49281abbd42ff5aa9a0a3846d935c41b943a (diff) | |
| download | vcpkg-22c8e3a23afc6be45020cd3f8c92bcea783ce8fa.tar.gz vcpkg-22c8e3a23afc6be45020cd3f8c92bcea783ce8fa.zip | |
[vcpkg build] fix build command (#12072)
Diffstat (limited to 'toolsrc/src/vcpkg.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg.cpp | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index 1cc264e91..859fe99c5 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -105,34 +105,7 @@ static void inner(vcpkg::Files::Filesystem& fs, const VcpkgCmdArguments& args) return command_function->function(args, paths); } - Triplet default_triplet; - if (args.triplet != nullptr) - { - default_triplet = Triplet::from_canonical_name(std::string(*args.triplet)); - } - else - { - auto vcpkg_default_triplet_env = System::get_environment_variable("VCPKG_DEFAULT_TRIPLET"); - if (auto v = vcpkg_default_triplet_env.get()) - { - default_triplet = Triplet::from_canonical_name(std::move(*v)); - } - else - { -#if defined(_WIN32) - default_triplet = Triplet::X86_WINDOWS; -#elif defined(__APPLE__) - default_triplet = Triplet::from_canonical_name("x64-osx"); -#elif defined(__FreeBSD__) - default_triplet = Triplet::from_canonical_name("x64-freebsd"); -#elif defined(__GLIBC__) - default_triplet = Triplet::from_canonical_name("x64-linux"); -#else - default_triplet = Triplet::from_canonical_name("x64-linux-musl"); -#endif - } - } - + Triplet default_triplet = vcpkg::default_triplet(args); Input::check_triplet(default_triplet, paths); if (const auto command_function = find_command(Commands::get_available_commands_type_a())) |
