diff options
Diffstat (limited to 'gyp/common.gypi')
| -rw-r--r-- | gyp/common.gypi | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index 5871779a2e..b3834934d3 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -44,6 +44,13 @@ 'cflags_cc': [ '-Wno-unknown-pragmas', # We are using '#pragma mark', but it is only available on Darwin. ], + 'conditions': [ + ['cxx_host != "clang"', { + 'cflags_cc': [ + '-fabi-version=0', + ], + }], + ] }], ], 'target_conditions': [ @@ -84,8 +91,8 @@ 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '0', 'GCC_GENERATE_DEBUGGING_SYMBOLS': 'YES', + 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES', 'DEAD_CODE_STRIPPING': 'NO', - 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', 'OTHER_CPLUSPLUSFLAGS': [ '-fno-omit-frame-pointer','-fwrapv', '-fstack-protector-all', '-fno-common'] } }, @@ -95,8 +102,8 @@ 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '3', 'GCC_GENERATE_DEBUGGING_SYMBOLS': 'YES', + 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES', 'DEAD_CODE_STRIPPING': 'NO', - 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO' } }, }, |