From d378d1f8237078596e0333204f36049b542f4681 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 23 May 2016 17:31:44 -0700 Subject: [build] Avoid variable name coupling between main.mk and configure --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') 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 $< $@ -- cgit v1.2.1