diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-10-15 13:59:31 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2015-11-02 18:41:34 -0500 |
| commit | 79a5a960370a1bfcb8a90a628d85b8cd6d9b6a76 (patch) | |
| tree | 5c418cf49c67eefc251a94606cf8e0b4e6d7d9a7 /gyp/common.gypi | |
| parent | ba7cc755e74006b14b46b13b65a100a519e402f3 (diff) | |
| download | qtlocation-mapboxgl-79a5a960370a1bfcb8a90a628d85b8cd6d9b6a76.tar.gz | |
[core] mason geojsonvt-2.1.6.3
- [osx] set -fvisibility-inlines-hidden in gyp/common.gypi to silence
mismatched visibility linker warnings
- [linux] set cxx_host in GYP_FLAGS to set -fabi-version=0 on gcc builds
to use clang-built mason binaries
- [ios] update symbol visibility for iOS tests
- [ios] link libgeojsonvt.a in iOS tests xcodeproj
- add libgeojsonvt.a to General -> Linked Frameworks and Libraries
- add mason_packages (recursive) to Build Settings -> Library Search Path
- [ios] add libuv and geojsonvt first in iOS libtool smush to ensure symbols
are found by later compilation units where they are undefined
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' } }, }, |