diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-05-03 16:33:02 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-05-04 15:06:18 -0700 |
| commit | 7bdf189a921fdee47044e907a3ff48ce8c880fe2 (patch) | |
| tree | f9e5b253020e4134ad58562fccece9d7832c6df5 /toolsrc/src/commands_env.cpp | |
| parent | a66b066d4584d6b92d249d71b9348344efc78d5e (diff) | |
| download | vcpkg-7bdf189a921fdee47044e907a3ff48ce8c880fe2.tar.gz vcpkg-7bdf189a921fdee47044e907a3ff48ce8c880fe2.zip | |
Rework vcpkg's triplet environment reading
The triplet is "run" and vcpkg observes the environment.
Previously, the environment was deduced by the triplet's name
Diffstat (limited to 'toolsrc/src/commands_env.cpp')
| -rw-r--r-- | toolsrc/src/commands_env.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/toolsrc/src/commands_env.cpp b/toolsrc/src/commands_env.cpp index 017d3c8f7..5e1ecc5e7 100644 --- a/toolsrc/src/commands_env.cpp +++ b/toolsrc/src/commands_env.cpp @@ -12,7 +12,8 @@ namespace vcpkg::Commands::Env args.check_exact_arg_count(0, example); args.check_and_get_optional_command_arguments({}); - System::cmd_execute_clean(Build::make_build_env_cmd(default_triplet, paths.get_toolset()) + L" && cmd"); + auto pre_build_info = Build::PreBuildInfo::from_triplet_file(paths, default_triplet); + System::cmd_execute_clean(Build::make_build_env_cmd(pre_build_info, paths.get_toolset()) + L" && cmd"); Checks::exit_success(VCPKG_LINE_INFO); } |