diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-02-21 12:09:19 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-02-21 17:34:15 +0200 |
| commit | 0c57efb9a864c3c270dc8af9853f7dc35958d9ca (patch) | |
| tree | 9de2903b6c8a068a3154944f0eca30f877aa6028 /gyp | |
| parent | bfd5ad3220e7abe928daca98605012c1a12ae377 (diff) | |
| download | qtlocation-mapboxgl-0c57efb9a864c3c270dc8af9853f7dc35958d9ca.tar.gz | |
[gyp] Use variant compiler flags when needed
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common.gypi | 2 | ||||
| -rw-r--r-- | gyp/core.gypi | 1 | ||||
| -rw-r--r-- | gyp/platform-android.gypi | 1 | ||||
| -rw-r--r-- | gyp/platform-ios.gypi | 1 | ||||
| -rw-r--r-- | gyp/platform-linux.gypi | 1 | ||||
| -rw-r--r-- | gyp/platform-osx.gypi | 1 |
6 files changed, 5 insertions, 2 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index 118c75000e..d54a31b640 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -20,7 +20,6 @@ '-Wno-variadic-macros', '-frtti', '-fexceptions', - '<@(variant_cflags)', '${CFLAGS}', ], 'GCC_WARN_PEDANTIC': 'YES', @@ -38,7 +37,6 @@ '-Wno-error=unused-parameter', '-frtti', '-fexceptions', - '<@(variant_cflags)', '${CFLAGS}', ], }], diff --git a/gyp/core.gypi b/gyp/core.gypi index acec3f15be..06497710d3 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -32,6 +32,7 @@ '<@(boost_cflags)', '<@(geojsonvt_cflags)', '<@(rapidjson_cflags)', + '<@(variant_cflags)', ], 'cflags': [ '<@(opengl_cflags)', diff --git a/gyp/platform-android.gypi b/gyp/platform-android.gypi index 91962ed856..e31a9c9bec 100644 --- a/gyp/platform-android.gypi +++ b/gyp/platform-android.gypi @@ -40,6 +40,7 @@ '<@(boost_cflags)', '<@(sqlite_cflags)', '<@(rapidjson_cflags)', + '<@(variant_cflags)', ], 'ldflags': [ '<@(libpng_ldflags)', diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index e33c3d453d..dc52db7acd 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -77,6 +77,7 @@ '<@(sqlite_cflags)', '<@(zlib_cflags)', '<@(rapidjson_cflags)', + '<@(variant_cflags)', ], 'ldflags': [ '<@(sqlite_ldflags)', diff --git a/gyp/platform-linux.gypi b/gyp/platform-linux.gypi index 0fae25d4b8..8865f68e1e 100644 --- a/gyp/platform-linux.gypi +++ b/gyp/platform-linux.gypi @@ -43,6 +43,7 @@ '<@(sqlite_cflags)', '<@(webp_cflags)', '<@(rapidjson_cflags)', + '<@(variant_cflags)', ], 'ldflags': [ '<@(libpng_ldflags)', diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi index 804a4cd9a6..581937ac66 100644 --- a/gyp/platform-osx.gypi +++ b/gyp/platform-osx.gypi @@ -68,6 +68,7 @@ '<@(sqlite_cflags)', '<@(zlib_cflags)', '<@(rapidjson_cflags)', + '<@(variant_cflags)', ], 'ldflags': [ '<@(zlib_ldflags)', |