Index: build/common.gypi |
=================================================================== |
--- build/common.gypi (revision 25940) |
+++ build/common.gypi (working copy) |
@@ -167,7 +167,9 @@ |
'target_defaults': { |
'variables': { |
'mac_release_optimization%': '3', # Use -O3 unless overridden |
- 'mac_debug_optimization%': '0' # Use -O0 unless overridden |
+ 'mac_debug_optimization%': '0', # Use -O0 unless overridden |
+ 'release_extra_cflags%': '', |
+ 'debug_extra_cflags%': '', |
}, |
'conditions': [ |
['branding=="Chrome"', { |
@@ -231,6 +233,7 @@ |
'xcode_settings': { |
'COPY_PHASE_STRIP': 'NO', |
'GCC_OPTIMIZATION_LEVEL': '<(mac_debug_optimization)', |
+ 'OTHER_CFLAGS': [ '<@(debug_extra_cflags)', ], |
}, |
'conditions': [ |
[ 'OS=="win"', { |
@@ -255,6 +258,11 @@ |
}, |
}, |
}], |
+ ['OS=="linux"', { |
+ 'cflags': [ |
+ '<@(debug_extra_cflags)', |
+ ], |
+ }], |
], |
}, |
'Release': { |
@@ -264,6 +272,7 @@ |
'xcode_settings': { |
'DEAD_CODE_STRIPPING': 'YES', # -Wl,-dead_strip |
'GCC_OPTIMIZATION_LEVEL': '<(mac_release_optimization)', |
+ 'OTHER_CFLAGS': [ '<@(release_extra_cflags)', ], |
}, |
'conditions': [ |
[ 'OS=="win" and msvs_use_common_release', { |
@@ -282,6 +291,11 @@ |
}, |
}, |
}], |
+ ['OS=="linux"', { |
+ 'cflags': [ |
+ '<@(release_extra_cflags)', |
+ ], |
+ }], |
], |
}, |
'conditions': [ |
@@ -447,7 +461,6 @@ |
'Release': { |
'variables': { |
'release_optimize%': '2', |
- 'release_extra_cflags%': '', |
}, |
'cflags': [ |
'-O<(release_optimize)', |
@@ -458,7 +471,6 @@ |
# can be removed at link time with --gc-sections. |
'-fdata-sections', |
'-ffunction-sections', |
- '<(release_extra_cflags)', |
], |
}, |
}, |