diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-17 20:44:40 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-17 20:44:40 +0300 |
| commit | 061511bc6958822de0db6e320cdcf24f5c0781ec (patch) | |
| tree | 88c0a910ddbbdbb6f10b4af82fed284e1dbdad1f | |
| parent | a08bb4cceaf27660234570c4c72881be416bdb9a (diff) | |
| download | qtlocation-mapboxgl-061511bc6958822de0db6e320cdcf24f5c0781ec.tar.gz | |
[build] Don't override CXX11ABI if already set
| -rw-r--r-- | platform/linux/scripts/configure.sh | 2 | ||||
| -rw-r--r-- | platform/qt/scripts/configure.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/linux/scripts/configure.sh b/platform/linux/scripts/configure.sh index 8f041d589a..6521fc8ccd 100644 --- a/platform/linux/scripts/configure.sh +++ b/platform/linux/scripts/configure.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -CXX11ABI=$(scripts/check-cxx11abi.sh) +CXX11ABI=${CXX11ABI:-$(scripts/check-cxx11abi.sh)} UNIQUE_RESOURCE_VERSION=dev PROTOZERO_VERSION=1.3.0 diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh index 4b855f7c58..461c1cc1b3 100644 --- a/platform/qt/scripts/configure.sh +++ b/platform/qt/scripts/configure.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -CXX11ABI=$(scripts/check-cxx11abi.sh) +CXX11ABI=${CXX11ABI:-$(scripts/check-cxx11abi.sh)} UNIQUE_RESOURCE_VERSION=dev PROTOZERO_VERSION=1.3.0 |