diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-05-10 14:41:04 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-05-10 14:41:04 +0300 |
| commit | 6a9a8e200863787b18b9f8aa921e1189616ac918 (patch) | |
| tree | 56dc3effc00a4b10ae35985424184cf43a768195 | |
| parent | 371d50b3fd902c276ed6f3e49e89284aced3f392 (diff) | |
| download | qtlocation-mapboxgl-6a9a8e200863787b18b9f8aa921e1189616ac918.tar.gz | |
[build] Fix broken build on OSX
| -rw-r--r-- | platform/linux/scripts/configure.sh | 4 | ||||
| -rw-r--r-- | platform/qt/scripts/configure.sh | 4 | ||||
| -rw-r--r-- | scripts/main.mk | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/platform/linux/scripts/configure.sh b/platform/linux/scripts/configure.sh index b2e79d9cc6..e14556385d 100644 --- a/platform/linux/scripts/configure.sh +++ b/platform/linux/scripts/configure.sh @@ -12,10 +12,10 @@ LIBUV_VERSION=1.7.5 ZLIB_VERSION=system NUNICODE_VERSION=1.6 GEOMETRY_VERSION=0.3.0 -GEOJSONVT_VERSION=4.1.2${CXX11ABI} +GEOJSONVT_VERSION=4.1.2${CXX11ABI:-} VARIANT_VERSION=1.1.0 RAPIDJSON_VERSION=1.0.2 -GTEST_VERSION=1.7.0${CXX11ABI} +GTEST_VERSION=1.7.0${CXX11ABI:-} PIXELMATCH_VERSION=0.9.0 WEBP_VERSION=0.5.0 diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh index 612a987ec7..72c25362b4 100644 --- a/platform/qt/scripts/configure.sh +++ b/platform/qt/scripts/configure.sh @@ -3,8 +3,8 @@ PROTOZERO_VERSION=1.3.0 BOOST_VERSION=1.60.0 GEOMETRY_VERSION=0.3.0 -GEOJSONVT_VERSION=4.1.2${CXX11ABI} -GTEST_VERSION=1.7.0${CXX11ABI} +GEOJSONVT_VERSION=4.1.2${CXX11ABI:-} +GTEST_VERSION=1.7.0${CXX11ABI:-} LIBJPEG_TURBO_VERSION=1.4.2 NUNICODE_VERSION=1.6 PIXELMATCH_VERSION=0.9.0 diff --git a/scripts/main.mk b/scripts/main.mk index 56b3fcd0c5..b42b472156 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -49,7 +49,6 @@ ifeq ($(PLATFORM),qt) endif # Defaults if not set -export CXX11ABI ?= "" export PLATFORM_OUTPUT ?= ./build/$(PLATFORM_SLUG) export PLATFORM_CONFIG_INPUT ?= platform/$(MASON_PLATFORM)/scripts/configure.sh export PLATFORM_CONFIG_OUTPUT ?= $(PLATFORM_OUTPUT)/config.gypi |