Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index c64efd7986dd1b5ba5f6bb0d8230ab9484c2865b..a9c0d5853d67e4c6b9f3899c905e9c404079942a 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -234,6 +234,8 @@ |
'cflags': [ |
'-O<(debug_optimize)', |
'-g', |
+ # One can use '-gstabs' to enable building the debugging |
+ # information in STABS format for breakpad's dumpsyms. |
], |
'ldflags': [ |
'-rdynamic', # Allows backtrace to resolve symbols. |
@@ -251,6 +253,13 @@ |
'-ffunction-sections', |
], |
}, |
+ # Some utility binaries need to be build with the host's native |
+ # config (i.e. no 32-bit override). |
+ 'Tool': { |
+ 'cflags!': ['-m32', '-march=pentium4', '-msse2', '-mfpmath=sse'], |
+ 'ldflags!': ['-m32'], |
+ 'cflags': [ '-O2' ], |
+ }, |
}, |
'variants': { |
'coverage': { |
@@ -302,18 +311,12 @@ |
# used during computation does not change depending on how the |
# compiler optimized the code, since the value is always kept |
# in its specified precision. |
- 'conditions': [ |
- ['branding=="Chromium"', { |
- 'cflags': [ |
- '-march=pentium4', |
- '-msse2', |
- '-mfpmath=sse', |
- ], |
- }], |
- ], |
'cflags': [ |
'-m32', |
+ '-march=pentium4', |
'-fno-exceptions', |
+ '-msse2', |
+ '-mfpmath=sse', |
'-Wall', |
], |
'ldflags': [ |
@@ -354,20 +357,6 @@ |
['_mac_bundle', { |
'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
}], |
- ['_type=="executable" and _mac_bundle', { |
- 'postbuilds': [ |
- { |
- 'variables': { |
- # Define remove_target_headers in a variable ending in _path |
- # so that gyp understands it's a path and performs proper |
- # relativization during dict merging. |
- 'remove_target_headers_path': 'mac/remove_target_headers', |
- }, |
- 'postbuild_name': 'Remove Target Headers', |
- 'action': ['<(remove_target_headers_path)'], |
- }, |
- ], |
- }], |
['_type=="executable"', { |
'postbuilds': [ |
{ |