From aed3869cfaf0f590f58265e203dd7b9a2ee38fb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Fri, 10 Mar 2017 10:40:16 -0800
Subject: [build] move ABI version awareness to mason.cmake

---
 Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index eeec31354f..3eadbe04a4 100644
--- a/Makefile
+++ b/Makefile
@@ -212,8 +212,7 @@ $(IOS_PROJ_PATH): $(IOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings $(BUILD_DEP
 	(cd $(IOS_OUTPUT_PATH) && cmake -G Xcode ../.. \
 		-DCMAKE_TOOLCHAIN_FILE=../../platform/ios/toolchain.cmake \
 		-DMBGL_PLATFORM=ios \
-		-DMASON_PLATFORM=ios \
-		-DMASON_PLATFORM_VERSION=8.0)
+		-DMASON_PLATFORM=ios)
 
 $(IOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings: platform/ios/WorkspaceSettings.xcsettings
 	mkdir -p "$(IOS_USER_DATA_PATH)"
@@ -513,8 +512,7 @@ $(MBGL_ANDROID_BUILD_DIR)/build.ninja: $(MBGL_ANDROID_BUILD_DIR)/env.sh platform
 	    -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \
 	    -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
 	    -DMBGL_PLATFORM=android \
-	    -DMASON_PLATFORM=android \
-	    -DMASON_PLATFORM_VERSION=$1-$3) && \
+	    -DMASON_PLATFORM=android) && \
 	$$$${CMAKE} \
 	    -H. \
 	    -B"$(MBGL_ANDROID_BUILD_DIR)"
-- 
cgit v1.2.1