From 061511bc6958822de0db6e320cdcf24f5c0781ec Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Fri, 17 Jun 2016 20:44:40 +0300 Subject: [PATCH] [build] Don't override CXX11ABI if already set --- platform/linux/scripts/configure.sh | 2 +- 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 8f041d589..6521fc8cc 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 4b855f7c5..461c1cc1b 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