From 9066b9527543f265790b4f4520262cd35505ed0b Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Thu, 28 Sep 2017 10:40:14 +0200 Subject: [PATCH] restore the feature to be able to specify the CXX via the environment. --- Installation/Jenkins/build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Installation/Jenkins/build.sh b/Installation/Jenkins/build.sh index b885a409ab99..97f2ce8506c5 100755 --- a/Installation/Jenkins/build.sh +++ b/Installation/Jenkins/build.sh @@ -120,6 +120,11 @@ fi COMPILE_MATTERS="3rdParty" +if test -z "${CXX}"; then + CC=/usr/bin/gcc + CXX=/usr/bin/g++ +fi + CFLAGS="-g -fno-omit-frame-pointer" CXXFLAGS="-g -fno-omit-frame-pointer" if test "${isCygwin}" == 1; then @@ -153,7 +158,7 @@ CLANG=0 COVERAGE=0 CPACK= FAILURE_TESTS=0 -GCC5=1 +GCC5=0 GCC6=0 GOLD=0 SANITIZE=0