diff options
| -rw-r--r-- | platform/linux/scripts/configure.sh | 2 | ||||
| -rw-r--r-- | platform/qt/scripts/configure.sh | 2 | ||||
| -rw-r--r-- | scripts/main.mk | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/platform/linux/scripts/configure.sh b/platform/linux/scripts/configure.sh index a578b25d9b..8ae3b2816d 100644 --- a/platform/linux/scripts/configure.sh +++ b/platform/linux/scripts/configure.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +CXX11ABI=$(scripts/check-cxx11abi.sh) + PROTOZERO_VERSION=1.3.0 BOOST_VERSION=1.60.0 BOOST_LIBPROGRAM_OPTIONS_VERSION=1.60.0 diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh index 43e91cb7c4..bf8ea049b6 100644 --- a/platform/qt/scripts/configure.sh +++ b/platform/qt/scripts/configure.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +CXX11ABI=$(scripts/check-cxx11abi.sh) + PROTOZERO_VERSION=1.3.0 BOOST_VERSION=1.60.0 GEOMETRY_VERSION=0.5.0 diff --git a/scripts/main.mk b/scripts/main.mk index b42b472156..bc7506db5c 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -2,7 +2,6 @@ ifeq ($(shell uname -s), Darwin) export PLATFORM ?= osx else ifeq ($(shell uname -s), Linux) export PLATFORM ?= linux - export CXX11ABI = $(shell scripts/check-cxx11abi.sh) endif ifeq ($(PLATFORM),android) |