diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-09-10 23:13:32 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-09-11 10:49:57 +0300 |
| commit | b9152e83d39d2afc58391131ace3881f798edf7c (patch) | |
| tree | 911ddfdbfc7554e56343aaa78a0ab7695d812622 /Makefile | |
| parent | 208f82fbe21634a06200209bb4311f47f96fe917 (diff) | |
| download | qtlocation-mapboxgl-upstream/tmpsantos-cxx11.tar.gz | |
[build] Remove CXX11 flagupstream/tmpsantos-cxx11
No longer needed after we vendorized so many deps.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -1,6 +1,5 @@ export BUILDTYPE ?= Debug export IS_LOCAL_DEVELOPMENT ?= true -export WITH_CXX11ABI ?= $(shell scripts/check-cxx11abi.sh) export TARGET_BRANCH ?= master CMAKE ?= cmake @@ -378,7 +377,6 @@ $(LINUX_BUILD): $(BUILD_DEPS) mkdir -p $(LINUX_OUTPUT_PATH) (cd $(LINUX_OUTPUT_PATH) && $(CMAKE) -G Ninja ../../.. \ -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ - -DWITH_CXX11ABI=${WITH_CXX11ABI} \ -DWITH_COVERAGE=${WITH_COVERAGE} \ -DWITH_OSMESA=${WITH_OSMESA} \ -DWITH_EGL=${WITH_EGL}) @@ -476,7 +474,6 @@ $(QT_BUILD): $(BUILD_DEPS) -DMASON_PLATFORM_VERSION=$(MASON_PLATFORM_VERSION) \ -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ -DWITH_QT_I18N=${WITH_QT_I18N} \ - -DWITH_CXX11ABI=${WITH_CXX11ABI} \ -DWITH_COVERAGE=${WITH_COVERAGE}) ifeq ($(HOST_PLATFORM), macos) @@ -491,7 +488,6 @@ $(MACOS_QT_PROJ_PATH): $(BUILD_DEPS) -DMASON_PLATFORM_VERSION=$(MASON_PLATFORM_VERSION) \ -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ -DWITH_QT_I18N=${WITH_QT_I18N} \ - -DWITH_CXX11ABI=${WITH_CXX11ABI} \ -DWITH_COVERAGE=${WITH_COVERAGE}) .PHONY: qtproj @@ -518,7 +514,6 @@ $(QNX_QT_BUILD): $(BUILD_DEPS) -DMBGL_PLATFORM=qt \ -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ -DWITH_QT_I18N=${WITH_QT_I18N} \ - -DWITH_CXX11ABI=${WITH_CXX11ABI} \ -DWITH_COVERAGE=${WITH_COVERAGE}) .PHONY: qnx-qt-lib |