diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-09-27 18:55:09 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-09-27 18:55:09 -0700 |
| commit | 0ccea4f3677d92a20935e03c2cb301d8300b43d1 (patch) | |
| tree | 85091281b06a275fd9802799ebd43c1bce24102d /toolsrc/src/vcpkg_Build.cpp | |
| parent | f617a711ec4c3d5527911c32340238053901269d (diff) | |
| download | vcpkg-0ccea4f3677d92a20935e03c2cb301d8300b43d1.tar.gz vcpkg-0ccea4f3677d92a20935e03c2cb301d8300b43d1.zip | |
[Toolset selection] Use VS2017 vcvarsall for v140 if available
Diffstat (limited to 'toolsrc/src/vcpkg_Build.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg_Build.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/toolsrc/src/vcpkg_Build.cpp b/toolsrc/src/vcpkg_Build.cpp index d40140aca..5ac13c6c6 100644 --- a/toolsrc/src/vcpkg_Build.cpp +++ b/toolsrc/src/vcpkg_Build.cpp @@ -67,7 +67,12 @@ namespace vcpkg::Build const auto arch = to_vcvarsall_toolchain(pre_build_info.target_architecture, toolset); const auto target = to_vcvarsall_target(pre_build_info.cmake_system_name); - return Strings::wformat(LR"("%s" %s %s %s 2>&1)", toolset.vcvarsall.native(), arch, target, tonull); + return Strings::wformat(LR"("%s" %s %s %s %s 2>&1)", + toolset.vcvarsall.native(), + Strings::join(L" ", toolset.vcvarsall_options), + arch, + target, + tonull); } static void create_binary_feature_control_file(const SourceParagraph& source_paragraph, |