diff options
Diffstat (limited to 'chromium/build/toolchain/win/toolchain.gni')
| -rw-r--r-- | chromium/build/toolchain/win/toolchain.gni | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/chromium/build/toolchain/win/toolchain.gni b/chromium/build/toolchain/win/toolchain.gni index 17414505bc4..34433d96e25 100644 --- a/chromium/build/toolchain/win/toolchain.gni +++ b/chromium/build/toolchain/win/toolchain.gni @@ -497,16 +497,26 @@ template("win_toolchains") { assert(defined(invoker.toolchain_arch)) toolchain_arch = invoker.toolchain_arch - win_toolchain_data = exec_script("//build/toolchain/win/setup_toolchain.py", - [ - visual_studio_path, - windows_sdk_path, - visual_studio_runtime_dirs, - "win", - toolchain_arch, - "environment." + toolchain_arch, - ], - "scope") + if (ninja_use_custom_environment_files) { + win_toolchain_data = exec_script("//build/toolchain/win/setup_toolchain.py", + [ + visual_studio_path, + windows_sdk_path, + visual_studio_runtime_dirs, + "win", + toolchain_arch, + "environment." + toolchain_arch, + ], + "scope") + } else { + win_toolchain_data = exec_script("//build/toolchain/win/setup_toolchain.py", + [ + "win", + toolchain_arch, + "environment." + toolchain_arch, + ], + "scope") + } # The toolchain using MSVC only makes sense when not doing cross builds. # Chromium exclusively uses the win_clang_ toolchain below, but V8 and |