aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/vcpkg.cpp
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-04-11 18:15:52 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-04-11 18:24:08 -0700
commit7326b6c64dc6b04b6d8512f13dddf67bf7498bf1 (patch)
treee6c095b1c26d0689730efe5f274bbeeb1090e57f /toolsrc/src/vcpkg.cpp
parent0bc21296c9ef32412237a8cc0c8141d0226b9070 (diff)
parent92c0a91d3fdd9a9df5d3feae611981ea170703f5 (diff)
downloadvcpkg-7326b6c64dc6b04b6d8512f13dddf67bf7498bf1.tar.gz
vcpkg-7326b6c64dc6b04b6d8512f13dddf67bf7498bf1.zip
Merge from master
Diffstat (limited to 'toolsrc/src/vcpkg.cpp')
-rw-r--r--toolsrc/src/vcpkg.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index 8cb2806d6..33b9fbe83 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -69,29 +69,29 @@ static void inner(const VcpkgCmdArguments& args)
return command_function(args, paths);
}
- Triplet default_target_triplet;
- if (args.target_triplet != nullptr)
+ Triplet default_triplet;
+ if (args.triplet != nullptr)
{
- default_target_triplet = Triplet::from_canonical_name(*args.target_triplet);
+ default_triplet = Triplet::from_canonical_name(*args.triplet);
}
else
{
const Optional<std::wstring> vcpkg_default_triplet_env = System::get_environmental_variable(L"VCPKG_DEFAULT_TRIPLET");
if (auto v = vcpkg_default_triplet_env.get())
{
- default_target_triplet = Triplet::from_canonical_name(Strings::utf16_to_utf8(*v));
+ default_triplet = Triplet::from_canonical_name(Strings::utf16_to_utf8(*v));
}
else
{
- default_target_triplet = Triplet::X86_WINDOWS;
+ default_triplet = Triplet::X86_WINDOWS;
}
}
- Input::check_triplet(default_target_triplet, paths);
+ Input::check_triplet(default_triplet, paths);
if (auto command_function = Commands::find(args.command, Commands::get_available_commands_type_a()))
{
- return command_function(args, paths, default_target_triplet);
+ return command_function(args, paths, default_triplet);
}
return invalid_command(args.command);