[build] Avoid variable name coupling between main.mk and configure.sh

2016-05-23 16:38:50 -07:00
parent 25c4436d37
commit f38f58f758
3 changed files with 4 additions and 1 deletions
--- 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
--- 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
--- 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)