mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-26 20:38:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Fix bug when building v141@64-bit from a v140@32-bit prompt

Browse Source
This commit is contained in:
Robert Schumacher 2017-02-23 04:35:00 -08:00
parent dd6d1aa560
commit 4b9f258c70
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolsrc/src/commands_build.cpp
View File

@ -37,6 +37,10 @@ namespace vcpkg::Commands::Build
}
}
// If these environment variables are set while running the VS2017 developer prompt, it will not correctly initialize the build environment.
_wputenv_s(L"VSINSTALLDIR", L"");
_wputenv_s(L"DevEnvDir", L"");
const fs::path ports_cmake_script_path = paths.ports_cmake;
const Environment::vcvarsall_and_platform_toolset vcvarsall_bat = Environment::get_vcvarsall_bat(paths);
const std::wstring command = Strings::wformat(LR"("%s" %s >nul 2>&1 && cmake -DCMD=BUILD -DPORT=%s -DTARGET_TRIPLET=%s -DVCPKG_PLATFORM_TOOLSET=%s "-DCURRENT_PORT_DIR=%s/." -P "%s")",