diff options
| author | Bert Belder <bertbelder@gmail.com> | 2018-08-28 01:59:38 +0200 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2018-08-28 02:01:42 +0200 |
| commit | f47582bbc5423adeab23d9c354b85c067bba451c (patch) | |
| tree | 80db2a01a40220f7ff620fe29bfbfaa32a1dfb5f | |
| parent | 7e3d9f8f2bef650f4ed37fa17c68a5afc4be7146 (diff) | |
build: regenerate BUILD.gn for cacheable windows toolchain
| -rw-r--r-- | build_extra/toolchain/win/BUILD.gn | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/build_extra/toolchain/win/BUILD.gn b/build_extra/toolchain/win/BUILD.gn index a90f3661d..a225f4c65 100644 --- a/build_extra/toolchain/win/BUILD.gn +++ b/build_extra/toolchain/win/BUILD.gn @@ -146,7 +146,7 @@ template("msvc_toolchain") { # invocation requires higher cpu usage compared to ninja invocation, and # the python wrapper is only needed to work around link.exe problems. # TODO(thakis): Remove wrapper once lld-link can merge manifests without - # relying on mt.exe being in %PATH% on Windows. + # relying on mt.exe being in %PATH% on Windows, https://crbug.com/872740 linker_wrapper = "ninja -t msvc -e $env -- " # Note trailing space. sys_lib_flags = "" } else { @@ -299,21 +299,6 @@ template("msvc_toolchain") { command = "$linker_wrapper$link /nologo ${sys_lib_flags}/OUT:$exename /PDB:$pdbname @$rspfile" - if (host_os == "win") { - shellprefix = "cmd /c" - } else { - shellprefix = "" - } - not_needed([ "shellprefix" ]) - - if (is_official_build) { - # On bots, the binary's PDB grow and eventually exceed 4G, causing the - # link to fail. As there's no utility to keeping the PDB around - # incrementally anyway in this config (because we're doing - # non-incremental LTCG builds), delete it before linking. - command = "$shellprefix $python_path $tool_wrapper_path delete-file $pdbname && $command" - } - default_output_extension = ".exe" default_output_dir = "{{root_out_dir}}" description = "LINK {{output}}" |