From 102a07cc63a4fb4a938893de36d8f459ca931f7a Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Tue, 10 Sep 2019 23:13:32 +0300 Subject: [build] Remove CXX11 flag No longer needed after we vendorized so many deps. --- Makefile | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a212fa9b92..916c01fed0 100644 --- a/Makefile +++ b/Makefile @@ -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 -- cgit v1.2.1