From 9ac639f08b3b94fb0393bb0b7d6c997975f61c19 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Sun, 23 Jun 2019 11:37:23 +0200
Subject: travis/build.sh: handle any version.
---
dist/travis/build.sh | 27 ++++++---------------------
1 file changed, 6 insertions(+), 21 deletions(-)
(limited to 'dist/travis')
diff --git a/dist/travis/build.sh b/dist/travis/build.sh
index 79e83ec3d..d3fef6910 100755
--- a/dist/travis/build.sh
+++ b/dist/travis/build.sh
@@ -90,31 +90,16 @@ case "$BLD" in
;;
llvm)
CXX="clang"
- CONFIG_OPTS=" --with-llvm-config CXX=$CXX"
+ CONFIG_OPTS="--with-llvm-config CXX=$CXX"
;;
llvm-3.5)
CXX="clang++"
- CONFIG_OPTS+=" --with-llvm-config=llvm-config-3.5 CXX=$CXX"
+ CONFIG_OPTS="--with-llvm-config=llvm-config-3.5 CXX=$CXX"
;;
- llvm-3.8)
- CXX="clang++-3.8"
- CONFIG_OPTS+=" --with-llvm-config=llvm-config-3.8 CXX=$CXX"
- ;;
- llvm-3.9)
- CXX="clang++-3.9"
- CONFIG_OPTS+=" --with-llvm-config=llvm-config-3.9 CXX=$CXX"
- ;;
- llvm-4.0)
- CXX="clang++-4.0"
- CONFIG_OPTS+=" --with-llvm-config=llvm-config-4.0 CXX=$CXX"
- ;;
- llvm-5.0)
- CXX="clang++-5.0"
- CONFIG_OPTS+=" --with-llvm-config=llvm-config-5.0 CXX=$CXX"
- ;;
- llvm-6.0)
- CXX="clang++-6.0"
- CONFIG_OPTS+=" --with-llvm-config=llvm-config-6.0 CXX=$CXX"
+ llvm-*)
+ llvmver=$(echo $BLD | sed -e "s/llvm-//")
+ CXX="clang++-$llvmber"
+ CONFIG_OPTS="--with-llvm-config=llvm-config-$llvmver CXX=$CXX"
;;
*)
echo "$ANSI_RED[GHDL - build] Unknown build $BLD $ANSI_NOCOLOR"
--
cgit v1.2.3