From cab21aa979c8074f44eac7425e918c3eabbd99e6 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Mon, 19 Aug 2019 14:59:06 +0200
Subject: [PATCH] Travis: Allow compiler version be set from outside
---
.dd4hep-ci.d/init_x86_64.sh | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/.dd4hep-ci.d/init_x86_64.sh b/.dd4hep-ci.d/init_x86_64.sh
index a9131a49c..658838dce 100644
--- a/.dd4hep-ci.d/init_x86_64.sh
+++ b/.dd4hep-ci.d/init_x86_64.sh
@@ -28,11 +28,13 @@ fi
if [ -z ${COMPILER_TYPE} ]; then
COMPILER_TYPE="gcc"
fi
-if [ ${COMPILER_TYPE} == "gcc" ]; then
- COMPILER_VERSION="gcc8"
-fi
-if [[ ${COMPILER_TYPE} == "clang" ]]; then
- COMPILER_VERSION="clang8"
+if [ -z ${COMPILER_VERSION} ]; then
+ if [ ${COMPILER_TYPE} == "gcc" ]; then
+ COMPILER_VERSION="gcc8"
+ fi
+ if [[ ${COMPILER_TYPE} == "clang" ]]; then
+ COMPILER_VERSION="clang8"
+ fi
fi
--
GitLab