summaryrefslogtreecommitdiff
path: root/platform/linux
diff options
context:
space:
mode:
Diffstat (limited to 'platform/linux')
-rw-r--r--platform/linux/mapboxgl-app.gypi26
1 files changed, 11 insertions, 15 deletions
diff --git a/platform/linux/mapboxgl-app.gypi b/platform/linux/mapboxgl-app.gypi
index 19c17f6249..a2c61e9d3b 100644
--- a/platform/linux/mapboxgl-app.gypi
+++ b/platform/linux/mapboxgl-app.gypi
@@ -39,31 +39,27 @@
'conditions': [
['OS == "mac"', {
- 'libraries': [ '<@(libraries)' ],
'xcode_settings': {
'SDKROOT': 'macosx',
'SUPPORTED_PLATFORMS':'macosx',
'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
- 'OTHER_LDFLAGS': [ '<@(ldflags)' ],
- 'SDKROOT': 'macosx',
'MACOSX_DEPLOYMENT_TARGET': '10.10',
},
- 'configurations': {
- 'Debug': {
- 'xcode_settings': {
- 'conditions': [
- ['enable_coverage=="1"', {
- 'OTHER_LDFLAGS': [ '--coverage' ],
- }],
- ],
- },
- },
- },
}, {
'cflags_cc': [ '<@(cflags_cc)' ],
- 'libraries': [ '<@(libraries)', '<@(ldflags)' ],
}]
],
+
+ 'link_settings': {
+ 'conditions': [
+ ['OS == "mac"', {
+ 'libraries': [ '<@(libraries)' ],
+ 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] }
+ }, {
+ 'libraries': [ '<@(libraries)', '<@(ldflags)' ],
+ }]
+ ],
+ },
},
],
}