Chromium Code Reviews| Index: build/config/win/BUILD.gn |
| diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn |
| index 852a86230f44b4c7f26b5e403f9d04667b4c62fd..90be9952c799d796c16958800bcd5362b2d0a9e5 100644 |
| --- a/build/config/win/BUILD.gn |
| +++ b/build/config/win/BUILD.gn |
| @@ -37,10 +37,6 @@ config("compiler") { |
| "/Gy", # Enable function-level linking. |
| "/FS", # Preserve previous PDB behavior. |
| "/bigobj", # Some of our files are bigger than the regular limits. |
| - |
| - # Tell the compiler to crash on failures. This is undocumented |
| - # and unsupported but very handy. |
| - "/d2FastFail", |
| ] |
| # Force C/C++ mode for the given GN detected file type. This is necessary |
| @@ -49,6 +45,15 @@ config("compiler") { |
| cflags_c = [ "/TC" ] |
| cflags_cc = [ "/TP" ] |
| + # Flags not supported in version 2013. |
|
Michael Achenbach
2016/07/21 09:03:19
We could also add this to the 2015 case below, but
|
| + if (visual_studio_version != "2013" && visual_studio_version != "2013e") { |
| + cflags += [ |
| + # Tell the compiler to crash on failures. This is undocumented |
| + # and unsupported but very handy. |
| + "/d2FastFail", |
| + ] |
| + } |
| + |
| if (visual_studio_version == "2015") { |
| cflags += [ |
| # Work around crbug.com/526851, bug in VS 2015 RTM compiler. |
| @@ -260,11 +265,16 @@ config("common_linker_setup") { |
| # 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", |
| ] |
| + # Flags not supported in version 2013. |
| + if (visual_studio_version != "2013" && visual_studio_version != "2013e") { |
| + ldflags += [ |
| + # Tell the linker to crash on failures. |
| + "/fastfail", |
| + ] |
| + } |
| + |
| # ASLR makes debugging with windbg difficult because Chrome.exe and |
| # Chrome.dll share the same base name. As result, windbg will name the |
| # Chrome.dll module like chrome_<base address>, where <base address> |