diff options
| author | brucedawson <brucedawson@chromium.org> | 2016-03-25 16:11:24 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-25 23:13:03 +0000 |
| commit | 304172167717e13b6579ecfb7e3fc63338de66ac (patch) | |
| tree | 76430cbfc34de2b63efb5206894c09eeaecb9bfe | |
| parent | 53e2f800170d79b1d8279f545e24078ece58e4ff (diff) | |
| download | chromium_src-304172167717e13b6579ecfb7e3fc63338de66ac.zip chromium_src-304172167717e13b6579ecfb7e3fc63338de66ac.tar.gz chromium_src-304172167717e13b6579ecfb7e3fc63338de66ac.tar.bz2 | |
Clean up gn VC++ linker settings
/fastfail and /maxilksize:0x7ff00000 were added to the wrong place in
crrev.com/1816333002 and need to be moved/merged. Also, the
mini_installer link command removes executable_config (which suppresses
LNK4199 warnings) and then triggers those warnings so that suppression
needs to be added back in.
The /maxilksize argument is also changed to be consistent and to avoid
duplication.
This doesn't change build behavior at all, it just suppresses some
warnings and tidies up the configuration.
Review URL: https://codereview.chromium.org/1835603002
Cr-Commit-Position: refs/heads/master@{#383399}
| -rw-r--r-- | build/config/compiler/BUILD.gn | 13 | ||||
| -rw-r--r-- | build/config/win/BUILD.gn | 6 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/BUILD.gn | 1 |
3 files changed, 6 insertions, 14 deletions
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index 37d583e..6104708 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -147,19 +147,6 @@ config("compiler") { ":compiler_codegen", ] - if (is_win) { - ldflags += [ - # Suggested by Microsoft Devrel to avoid - # LINK : fatal error LNK1248: image size (80000000) exceeds maximum allowable size (80000000) - # which started happening more regularly after VS2013 Update 4. - # Needs to be a bit lower for VS2015, or else errors out. - "/maxilksize:0x7ff00000", - - # Tell the linker to crash on failures. - "/fastfail", - ] - } - # In general, Windows is totally different, but all the other builds share # some common GCC configuration. if (!is_win) { diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn index bf1e613..7945cfc 100644 --- a/build/config/win/BUILD.gn +++ b/build/config/win/BUILD.gn @@ -244,7 +244,11 @@ config("common_linker_setup") { # LINK : fatal error LNK1248: image size (80000000) # exceeds maximum allowable size (80000000) # which started happening more regularly after VS2013 Update 4. - "/maxilksize:2147483647", + # Needs to be a bit lower for VS2015, or else errors out. + "/maxilksize:0x7ff00000", + + # Tell the linker to crash on failures. + "/fastfail", ] # ASLR makes debugging with windbg difficult because Chrome.exe and diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn index ada08a9..643d7bd 100644 --- a/chrome/installer/mini_installer/BUILD.gn +++ b/chrome/installer/mini_installer/BUILD.gn @@ -190,6 +190,7 @@ executable("mini_installer") { ldflags = [ "/ENTRY:MainEntryPoint", "/FIXED:NO", + "/ignore:4199", "/NXCOMPAT", ] |