summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2015-12-17 10:09:44 -0800
committerBruno de Oliveira Abinader <bruno@mapbox.com>2015-12-17 12:28:36 -0800
commitc08a97e453087cc82f190f5cee9c79c60570fee3 (patch)
tree403897f8b391437749c2181db7c4682a9509a76c
parent986e0ae39e8a301a3fb6a2cb5f852da3a30417f4 (diff)
downloadqtlocation-mapboxgl-c08a97e453087cc82f190f5cee9c79c60570fee3.tar.gz
[osx] Fixed 'make compdb' target'
[skip ci]
-rw-r--r--platform/osx/app/mapboxgl-app.gypi4
-rw-r--r--platform/osx/sdk/framework-osx.gypi2
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/osx/app/mapboxgl-app.gypi b/platform/osx/app/mapboxgl-app.gypi
index 97474b79d6..88e4227e26 100644
--- a/platform/osx/app/mapboxgl-app.gypi
+++ b/platform/osx/app/mapboxgl-app.gypi
@@ -37,7 +37,7 @@
'CLANG_ENABLE_OBJC_ARC': 'YES',
'INFOPLIST_FILE': '../platform/osx/app/Info.plist',
'LD_RUNPATH_SEARCH_PATHS': [
- '$(inherited)',
+ '\${inherited}',
'@executable_path/../Frameworks',
],
'PRODUCT_BUNDLE_IDENTIFIER': 'com.mapbox.MapboxGL',
@@ -60,7 +60,7 @@
'copies': [
{
- 'destination': '<(PRODUCT_DIR)/$(FRAMEWORKS_FOLDER_PATH)',
+ 'destination': '<(PRODUCT_DIR)/\${FRAMEWORKS_FOLDER_PATH}',
'files': [
'<(PRODUCT_DIR)/Mapbox.framework',
],
diff --git a/platform/osx/sdk/framework-osx.gypi b/platform/osx/sdk/framework-osx.gypi
index ef5ac5efd4..3c3fb607af 100644
--- a/platform/osx/sdk/framework-osx.gypi
+++ b/platform/osx/sdk/framework-osx.gypi
@@ -24,7 +24,7 @@
'DYLIB_INSTALL_NAME_BASE': '@rpath',
'INFOPLIST_FILE': '../platform/osx/sdk/Info.plist',
'LD_RUNPATH_SEARCH_PATHS': [
- '$(inherited)',
+ '${inherited}',
'@executable_path/../Frameworks',
'@loader_path/Frameworks',
],