diff options
| author | scottmg <scottmg@chromium.org> | 2014-11-19 11:33:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-19 19:33:52 +0000 |
| commit | 9bf8fb3b74de68a85122cb45bb477d604b8c3898 (patch) | |
| tree | 84dc768eff3f2d518b585f11a1ac05ac91beabea /build/toolchain/win/BUILD.gn | |
| parent | 7d32e3f4382b6c0abcc0e89d5c8412a784bf0bbc (diff) | |
| download | chromium_src-9bf8fb3b74de68a85122cb45bb477d604b8c3898.zip chromium_src-9bf8fb3b74de68a85122cb45bb477d604b8c3898.tar.gz chromium_src-9bf8fb3b74de68a85122cb45bb477d604b8c3898.tar.bz2 | |
gn win: Various toolchain fixes to get compile working
This fixes
"fatal error C1902: Program database manager mismatch; please check your installation"
and
"cannot find msvcr120.dll"
during gn compilation.
There were many things wrong. The primary ones were that:
1) the compiler's setup script wasn't called so we didn't get
PATH/LIB/INCLUDE for the correct cl.
2) the VS runtime dirs were not getting added to environment block.
I also removed the Express handling, as that's been removed from the
gyp path now.
This does not yet support a system-installed Visual Studio. Code
needs to be added to query the registry to find the install location.
(see _SetupScript).
R=dpranke@chromium.org
TBR=brettw@chromium.org
BUG=432375
Review URL: https://codereview.chromium.org/736073002
Cr-Commit-Position: refs/heads/master@{#304864}
Diffstat (limited to 'build/toolchain/win/BUILD.gn')
| -rw-r--r-- | build/toolchain/win/BUILD.gn | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn index 988683d..87bd254 100644 --- a/build/toolchain/win/BUILD.gn +++ b/build/toolchain/win/BUILD.gn @@ -16,7 +16,12 @@ assert(is_win) gyp_win_tool_path = rebase_path("//tools/gyp/pylib/gyp/win_tool.py", root_build_dir) exec_script("setup_toolchain.py", - [ visual_studio_path, gyp_win_tool_path, windows_sdk_path ]) + [ + visual_studio_path, + gyp_win_tool_path, + windows_sdk_path, + visual_studio_runtime_dirs + ]) # This value will be inherited in the toolchain below. concurrent_links = exec_script("../get_concurrent_links.py", [], "value") |