diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-23 16:38:50 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-23 17:36:20 -0700 |
| commit | f38f58f758f54aeeb667c3e029b96fb43ada7892 (patch) | |
| tree | 888ffdeb0470749769bfbcfd3f61b41f6b6360d4 /platform | |
| parent | 25c4436d37d84cb8eb800385b412e784a0789087 (diff) | |
| download | qtlocation-mapboxgl-f38f58f758f54aeeb667c3e029b96fb43ada7892.tar.gz | |
[build] Avoid variable name coupling between main.mk and configure.sh
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/linux/scripts/configure.sh | 2 | ||||
| -rw-r--r-- | platform/qt/scripts/configure.sh | 2 |
2 files changed, 4 insertions, 0 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 |