diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-05 13:51:28 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-05 18:27:07 -0700 |
| commit | 9a963f7eff1981d4e894ea8b297d092cda60b764 (patch) | |
| tree | ab7da468d01a9e4e18dbbd84aa7f6597695700c1 /toolsrc/src/commands_env.cpp | |
| parent | 7f68aa6630f96f474e85cd332dbbdc1ce6226d50 (diff) | |
| download | vcpkg-9a963f7eff1981d4e894ea8b297d092cda60b764.tar.gz vcpkg-9a963f7eff1981d4e894ea8b297d092cda60b764.zip | |
Overhaul VS selection. Add triplet option to specify VS instance
Diffstat (limited to 'toolsrc/src/commands_env.cpp')
| -rw-r--r-- | toolsrc/src/commands_env.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/commands_env.cpp b/toolsrc/src/commands_env.cpp index 073c501f5..6dad3e882 100644 --- a/toolsrc/src/commands_env.cpp +++ b/toolsrc/src/commands_env.cpp @@ -13,8 +13,8 @@ namespace vcpkg::Commands::Env args.check_and_get_optional_command_arguments({}); const 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(pre_build_info.platform_toolset)) + L" && cmd"); + const Toolset& toolset = paths.get_toolset(pre_build_info.platform_toolset, pre_build_info.visual_studio_path); + System::cmd_execute_clean(Build::make_build_env_cmd(pre_build_info, toolset) + L" && cmd"); Checks::exit_success(VCPKG_LINE_INFO); } |