summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-05-23 17:31:44 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-05-23 17:38:11 -0700
commitd378d1f8237078596e0333204f36049b542f4681 (patch)
tree25fd1ae1810e5390739381821c1249101eadf2cc /Makefile
parent58cd5cae12ede01f8cc8d837ecb1870419e7967a (diff)
downloadqtlocation-mapboxgl-d378d1f8237078596e0333204f36049b542f4681.tar.gz
[build] Avoid variable name coupling between main.mk and configure
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index eff5e4206b..bbda2a5731 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ OSX_WORK_PATH = platform/osx/osx.xcworkspace
OSX_USER_DATA_PATH = $(OSX_WORK_PATH)/xcuserdata/$(USER).xcuserdatad
$(OSX_OUTPUT_PATH)/config.gypi: platform/osx/scripts/configure.sh .mason configure
- MASON_PLATFORM=osx ./configure $< $@
+ ./configure $< $@ osx
$(OSX_OUTPUT_PATH)/mbgl.xcconfig: $(OSX_OUTPUT_PATH)/config.gypi
./scripts/export-xcconfig.py $< $@
@@ -88,7 +88,7 @@ IOS_WORK_PATH = platform/ios/ios.xcworkspace
IOS_USER_DATA_PATH = $(IOS_WORK_PATH)/xcuserdata/$(USER).xcuserdatad
$(IOS_OUTPUT_PATH)/config.gypi: platform/ios/scripts/configure.sh .mason configure
- MASON_PLATFORM=ios ./configure $< $@
+ ./configure $< $@ ios
$(IOS_OUTPUT_PATH)/mbgl.xcconfig: $(IOS_OUTPUT_PATH)/config.gypi
./scripts/export-xcconfig.py $< $@