[build] Control libstdc++ usage via WITH_CXX11ABI

This commit is contained in:
Bruno de Oliveira Abinader
2017-04-27 18:00:30 +03:00
parent 9be076ffe9
commit 52cddfc08a
2 changed files with 5 additions and 1 deletions

View File

@@ -12,6 +12,9 @@ option(WITH_EGL "Use EGL backend" OFF)
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)

View File

@@ -1,4 +1,5 @@
export BUILDTYPE ?= Debug
export WITH_CXX11ABI ?= $(shell scripts/check-cxx11abi.sh)
ifeq ($(BUILDTYPE), Release)
else ifeq ($(BUILDTYPE), Debug)
@@ -293,7 +294,7 @@ $(LINUX_BUILD): $(BUILD_DEPS)
(cd $(LINUX_OUTPUT_PATH) && cmake -G Ninja ../../.. \
-DCMAKE_BUILD_TYPE=$(BUILDTYPE) \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \
-DWITH_CXX11ABI=${WITH_CXX11ABI} \
-DWITH_COVERAGE=${WITH_COVERAGE} \
-DWITH_OSMESA=${WITH_OSMESA} \
-DWITH_EGL=${WITH_EGL})