[core] mason geojsonvt-2.1.6.3

- [osx] set -fvisibility-inlines-hidden in gyp/common.gypi to silence
  mismatched visibility linker warnings
- [linux] set cxx_host in GYP_FLAGS to set -fabi-version=0 on gcc builds
  to use clang-built mason binaries
- [ios] update symbol visibility for iOS tests
- [ios] link libgeojsonvt.a in iOS tests xcodeproj
  - add libgeojsonvt.a to General -> Linked Frameworks and Libraries
  - add mason_packages (recursive) to Build Settings -> Library Search Path
- [ios] add libuv and geojsonvt first in iOS libtool smush to ensure symbols
  are found by later compilation units where they are undefined

7 files changed, 16 insertions, 11 deletions

diff --git a/scripts/android/configure.sh b/scripts/android/configure.sh
index 1a42736c2f..2642584415 100644
--- a/scripts/android/configure.sh
+++ b/scripts/android/configure.sh
@@ -10,6 +10,7 @@ LIBUV_VERSION=1.7.5
 ZLIB_VERSION=system
 NUNICODE_VERSION=1.6
 LIBZIP_VERSION=0.11.2
+GEOJSONVT_VERSION=2.1.6.3
 VARIANT_VERSION=1.0
 RAPIDJSON_VERSION=1.0.2
 
diff --git a/scripts/ios/configure.sh b/scripts/ios/configure.sh
index 020c70b797..7eb4a5b416 100644
--- a/scripts/ios/configure.sh
+++ b/scripts/ios/configure.sh
@@ -4,5 +4,6 @@ BOOST_VERSION=1.59.0
 SQLITE_VERSION=system
 LIBUV_VERSION=1.7.5
 ZLIB_VERSION=system
+GEOJSONVT_VERSION=2.1.6.3
 VARIANT_VERSION=1.0
 RAPIDJSON_VERSION=1.0.2
diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh
index ec0b4204dd..e5edc2789a 100755
--- a/scripts/ios/package.sh
+++ b/scripts/ios/package.sh
@@ -74,15 +74,17 @@ step "Building static library..."
 LIBS=(core.a platform-ios.a asset-fs.a cache-sqlite.a http-nsurl.a)
 if [[ "${BUILD_FOR_DEVICE}" == true ]]; then
     libtool -static -no_warning_for_no_symbols \
+        `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a` \
+        `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojsonvt.a` \
         -o ${OUTPUT}/static/lib${NAME}.a \
         ${LIBS[@]/#/build/${BUILDTYPE}-iphoneos/libmbgl-} \
-        ${LIBS[@]/#/build/${BUILDTYPE}-iphonesimulator/libmbgl-} \
-        `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a`
+        ${LIBS[@]/#/build/${BUILDTYPE}-iphonesimulator/libmbgl-}
 else
     libtool -static -no_warning_for_no_symbols \
+        `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a` \
+        `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojsonvt.a` \
         -o ${OUTPUT}/static/lib${NAME}.a \
-        ${LIBS[@]/#/build/${BUILDTYPE}-iphonesimulator/libmbgl-} \
-        `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a`
+        ${LIBS[@]/#/build/${BUILDTYPE}-iphonesimulator/libmbgl-}
 fi
 echo "Created ${OUTPUT}/static/lib${NAME}.a"
 
diff --git a/scripts/linux/configure.sh b/scripts/linux/configure.sh
index 9041bf084a..f270c903ee 100644
--- a/scripts/linux/configure.sh
+++ b/scripts/linux/configure.sh
@@ -11,6 +11,7 @@ LIBUV_VERSION=1.7.5
 ZLIB_VERSION=system
 NUNICODE_VERSION=1.6
 LIBZIP_VERSION=1.0.1
+GEOJSONVT_VERSION=2.1.6.3
 VARIANT_VERSION=1.0
 RAPIDJSON_VERSION=1.0.2
 GTEST_VERSION=1.7.0
diff --git a/scripts/main.mk b/scripts/main.mk
index 75e574d26d..15e3484e01 100644
--- a/scripts/main.mk
+++ b/scripts/main.mk
@@ -22,6 +22,11 @@ ifneq (,$(wildcard scripts/$(HOST)/$(HOST_VERSION)/configure.sh))
 	CONFIGURE_FILES += scripts/$(HOST)/$(HOST_VERSION)/configure.sh
 endif
 
+ifneq (,$(findstring clang,$(CXX)))
+	CXX_HOST = "clang"
+else ifneq (,$(findstring g++,$(CXX)))
+	CXX_HOST = "g++"
+endif
 
 # Text formatting
 TEXT_BOLD = \033[1m
@@ -38,10 +43,6 @@ SUBMODULES += .mason/mason.sh
 .mason/mason.sh:
 	./scripts/flock.py .git/Submodule.lock git submodule update --init .mason
 
-SUBMODULES += src/mbgl/util/geojsonvt/geojsonvt.hpp
-src/mbgl/util/geojsonvt/geojsonvt.hpp:
-	./scripts/flock.py .git/Submodule.lock git submodule update --init src/mbgl/util/geojsonvt
-
 ifeq ($(HOST),ios)
 SUBMODULES += platform/ios/vendor/SMCalloutView/SMCalloutView.h
 platform/ios/vendor/SMCalloutView/SMCalloutView.h:
@@ -70,6 +71,7 @@ GYP_FLAGS += -Dcache_lib=$(CACHE)
 GYP_FLAGS += -Dheadless_lib=$(HEADLESS)
 GYP_FLAGS += -Dtest=$(BUILD_TEST)
 GYP_FLAGS += -Drender=$(BUILD_RENDER)
+GYP_FLAGS += -Dcxx_host=$(CXX_HOST)
 GYP_FLAGS += --depth=.
 GYP_FLAGS += -Goutput_dir=.
 GYP_FLAGS += --generator-output=./build/$(HOST_SLUG)
diff --git a/scripts/osx/configure.sh b/scripts/osx/configure.sh
index a325273a7d..34024a40f4 100644
--- a/scripts/osx/configure.sh
+++ b/scripts/osx/configure.sh
@@ -11,6 +11,7 @@ LIBUV_VERSION=1.7.5
 ZLIB_VERSION=system
 NUNICODE_VERSION=1.6
 LIBZIP_VERSION=1.0.1
+GEOJSONVT_VERSION=2.1.6.3
 VARIANT_VERSION=1.0
 RAPIDJSON_VERSION=1.0.2
 GTEST_VERSION=1.7.0
diff --git a/scripts/osx/run.sh b/scripts/osx/run.sh
index 1020879471..28c1adba1b 100755
--- a/scripts/osx/run.sh
+++ b/scripts/osx/run.sh
@@ -11,9 +11,6 @@ BUILDTYPE=${BUILDTYPE:-Release}
 # Build
 ################################################################################
 
-mapbox_time "checkout_geojsonvt" \
-git submodule update --init src/mbgl/util/geojsonvt
-
 mapbox_time "compile_program" \
 make xosx -j${JOBS} BUILDTYPE=${BUILDTYPE}