Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index cff6f608d5f00c0e533b23d92c2f05b5ce3b68a6..b8c8f1a2679a604c3c37167063f145fecbad775a 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -1230,6 +1230,10 @@ |
| # whether warnings are treated as errors. |
| 'chromium_code%': 0, |
| + # Disable fatal linker warnings, similarly to how we make it possible |
| + # to disable -Werror (e.g. for different toolchain versions). |
| + 'disable_fatal_linker_warnings%': 0, |
| + |
| 'release_valgrind_build%': 0, |
| # TODO(thakis): Make this a blacklist instead, http://crbug.com/101600 |
| @@ -3073,11 +3077,19 @@ |
| ['os_posix==1 and (chromeos==0 or target_arch!="arm")', { |
|
jochen (gone - plz use gerrit)
2014/04/04 15:02:40
can you move the 'and (...)' part to the condition
Paweł Hajdan Jr.
2014/04/04 15:09:33
Done. Note that now this might unexpectedly break
|
| 'target_defaults': { |
| 'ldflags': [ |
| - '-Wl,--fatal-warnings', |
| '-Wl,-z,now', |
| '-Wl,-z,relro', |
| ], |
| }, |
| + 'conditions': [ |
| + ['disable_fatal_linker_warnings==0', { |
| + 'target_defaults': { |
| + 'ldflags': [ |
| + '-Wl,--fatal-warnings', |
| + ], |
| + }, |
| + }], |
| + ], |
| }], |
| ['os_posix==1 and chromeos==0', { |
| # Chrome OS enables -fstack-protector-strong via its build wrapper, |