aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/main.cpp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2016-09-28 12:39:05 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2016-09-29 15:00:40 -0700
commitfb1130876f228464254e3e818fae42445405f6ed (patch)
tree879e126efe14076434eca350a7aae44aba3b6515 /toolsrc/src/main.cpp
parentac2e248e8f6c482811e33bcc1f311b0543be2d80 (diff)
downloadvcpkg-fb1130876f228464254e3e818fae42445405f6ed.tar.gz
vcpkg-fb1130876f228464254e3e818fae42445405f6ed.zip
Valiting triplets is now the responsibility of vcpkg_paths
Diffstat (limited to 'toolsrc/src/main.cpp')
-rw-r--r--toolsrc/src/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/src/main.cpp b/toolsrc/src/main.cpp
index a2f6fa10f..c7162dce0 100644
--- a/toolsrc/src/main.cpp
+++ b/toolsrc/src/main.cpp
@@ -70,14 +70,14 @@ static void inner(const vcpkg_cmd_arguments& args)
}
triplet default_target_triplet;
- if(args.target_triplet != nullptr)
+ if (args.target_triplet != nullptr)
{
default_target_triplet = {*args.target_triplet};
}
else
{
const auto vcpkg_default_triplet_env = System::wdupenv_str(L"VCPKG_DEFAULT_TRIPLET");
- if(!vcpkg_default_triplet_env.empty())
+ if (!vcpkg_default_triplet_env.empty())
{
default_target_triplet = {Strings::utf16_to_utf8(vcpkg_default_triplet_env)};
}
@@ -87,7 +87,7 @@ static void inner(const vcpkg_cmd_arguments& args)
}
}
- if(!default_target_triplet.validate(paths))
+ if (!paths.validate_triplet(default_target_triplet))
{
System::println(System::color::error, "Error: invalid triplet: %s", default_target_triplet.value);
TrackProperty("error", "invalid triplet: " + default_target_triplet.value);