aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/vcpkg.cpp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-04-10 13:00:33 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-04-10 13:00:33 -0700
commit410aa5b43a5fa995d8684590b119bbb04353a139 (patch)
tree6f3a449d9ef514c14b939a69daef6ee83c0673b9 /toolsrc/src/vcpkg.cpp
parentcd0c8e1ca3fa99bfbb907eb06e0f58ce47972dda (diff)
downloadvcpkg-410aa5b43a5fa995d8684590b119bbb04353a139.tar.gz
vcpkg-410aa5b43a5fa995d8684590b119bbb04353a139.zip
default_target_triplet -> default_triplet
Diffstat (limited to 'toolsrc/src/vcpkg.cpp')
-rw-r--r--toolsrc/src/vcpkg.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index aa19df616..ffe325f6e 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;
+ Triplet default_triplet;
if (args.target_triplet != nullptr)
{
- default_target_triplet = Triplet::from_canonical_name(*args.target_triplet);
+ default_triplet = Triplet::from_canonical_name(*args.target_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);