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 | |
parent | 208f82fbe21634a06200209bb4311f47f96fe917 (diff) | |
download | qtlocation-mapboxgl-b9152e83d39d2afc58391131ace3881f798edf7c.tar.gz |
[build] Remove CXX11 flagupstream/tmpsantos-cxx11
No longer needed after we vendorized so many deps.
-rw-r--r-- | CMakeLists.txt | 8 | ||||
-rw-r--r-- | Makefile | 5 | ||||
-rw-r--r-- | circle.yml | 5 | ||||
-rw-r--r-- | platform/linux/config.cmake | 8 | ||||
-rwxr-xr-x | scripts/check-cxx11abi.dat | bin | 8780 -> 0 bytes | |||
-rwxr-xr-x | scripts/check-cxx11abi.sh | 21 |
6 files changed, 1 insertions, 46 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d8881f4a1c..9afded1deb 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() @@ -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 d32e206e4a..453aab85ac 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 aa65ddb606..d7bfad0011 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 Binary files differdeleted file mode 100755 index eab7298b50..0000000000 --- a/scripts/check-cxx11abi.dat +++ /dev/null diff --git a/scripts/check-cxx11abi.sh b/scripts/check-cxx11abi.sh deleted file mode 100755 index c6fd9258c5..0000000000 --- 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 |