From 102a07cc63a4fb4a938893de36d8f459ca931f7a Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Tue, 10 Sep 2019 23:13:32 +0300 Subject: [PATCH] [build] Remove CXX11 flag No longer needed after we vendorized so many deps. --- CMakeLists.txt | 8 -------- Makefile | 5 ----- circle.yml | 5 +---- platform/linux/config.cmake | 8 -------- scripts/check-cxx11abi.dat | Bin 8780 -> 0 bytes scripts/check-cxx11abi.sh | 21 --------------------- 6 files changed, 1 insertion(+), 46 deletions(-) delete mode 100755 scripts/check-cxx11abi.dat delete mode 100755 scripts/check-cxx11abi.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index d8881f4a1..9afded1de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,6 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.11) -option(WITH_CXX11ABI "Use the C++11 ABI" ON) option(WITH_COVERAGE "Enable coverage reports" OFF) option(WITH_OSMESA "Use OSMesa headless backend" OFF) option(WITH_EGL "Use EGL backend" OFF) @@ -40,13 +39,6 @@ include(cmake/mason.cmake) include(cmake/xcode.cmake) include(cmake/doxygen.cmake) -if(WITH_CXX11ABI) - set(MASON_CXXABI_SUFFIX -cxx11abi) - add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1) -else() - add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) -endif() - if(WITH_OSMESA AND WITH_EGL) message(FATAL_ERROR "WITH_OSMESA and WITH_EGL are mutually exclusive.") endif() diff --git a/Makefile b/Makefile index a212fa9b9..916c01fed 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 diff --git a/circle.yml b/circle.yml index d32e206e4..453aab85a 100644 --- a/circle.yml +++ b/circle.yml @@ -260,7 +260,7 @@ commands: command: | mkdir -p build cd build - cmake -DWITH_CXX11ABI=${WITH_CXX11ABI:0} -DWITH_COVERAGE=${WITH_COVERAGE:0} -DWITH_OSMESA=${WITH_OSMESA:0} -DWITH_EGL=${WITH_EGL:0} .. + cmake -DWITH_COVERAGE=${WITH_COVERAGE:0} -DWITH_OSMESA=${WITH_OSMESA:0} -DWITH_EGL=${WITH_EGL:0} .. cd .. build-node: steps: @@ -798,7 +798,6 @@ jobs: JOBS: 4 BUILDTYPE: RelWithDebInfo WITH_EGL: 1 - WITH_CXX11ABI: 0 steps: - install-dependencies - build-node @@ -855,7 +854,6 @@ jobs: JOBS: 4 BUILDTYPE: Debug WITH_EGL: 1 - WITH_CXX11ABI: 1 steps: - install-dependencies - check-if-this-job-can-be-skipped @@ -920,7 +918,6 @@ jobs: JOBS: 4 BUILDTYPE: Debug WITH_EGL: 1 - WITH_CXX11ABI: 0 DISPLAY: :0 steps: - install-dependencies diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index aa65ddb60..d7bfad001 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -101,14 +101,6 @@ macro(mbgl_platform_core) PRIVATE nunicode PUBLIC -lz ) - - if(WITH_CXX11ABI) - # Statically link libstdc++ when we're using the new STL ABI - target_link_libraries(mbgl-core - PUBLIC -static-libstdc++ - PUBLIC -Wl,-Bsymbolic-functions - ) - endif() endmacro() diff --git a/scripts/check-cxx11abi.dat b/scripts/check-cxx11abi.dat deleted file mode 100755 index eab7298b504c495651b410f6c12f8d6704744b89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8780 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 bh65hXAWF4#x+d1s5R5L*E95<}Y;f@}k-?Zr diff --git a/scripts/check-cxx11abi.sh b/scripts/check-cxx11abi.sh deleted file mode 100755 index c6fd9258c..000000000 --- a/scripts/check-cxx11abi.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -if ! [ `uname -s` = 'Linux' ] || \ - ! command -v readelf > /dev/null || \ - ! command -v c++filt > /dev/null; then - echo -n "OFF" - exit 0 -fi - -# check-cxx11abi.dat is a binary just so we can use the loader -# to take care of finding the libstdc++ which can be tricky. -LIBSTDCPP=$(ldd $(dirname $0)/check-cxx11abi.dat |grep libstdc++ |cut -d' ' -f3) - -if [ $(readelf -Ws $LIBSTDCPP |c++filt |grep -c ::__cxx11::) -gt 0 ]; then - echo -n "ON" -else - echo -n "OFF" -fi