From 52cddfc08addf17e23f9cf74787a6ead40797c1d Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Thu, 27 Apr 2017 18:00:30 +0300 Subject: [build] Control libstdc++ usage via WITH_CXX11ABI --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9323aa63d9..df5f0eadb5 100644 --- a/Makefile +++ b/Makefile @@ -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}) -- cgit v1.2.1