diff options
| author | Tristan Gingold <tgingold@free.fr> | 2019-06-23 11:37:23 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2019-06-23 11:37:23 +0200 |
| commit | 9ac639f08b3b94fb0393bb0b7d6c997975f61c19 (patch) | |
| tree | 1979a440a0f73e52363a4459b6d8a79be2566281 /dist/travis | |
| parent | 8d92e3561725148d0447dff7a9330e239f8d0f98 (diff) | |
| download | ghdl-9ac639f08b3b94fb0393bb0b7d6c997975f61c19.tar.gz ghdl-9ac639f08b3b94fb0393bb0b7d6c997975f61c19.tar.bz2 ghdl-9ac639f08b3b94fb0393bb0b7d6c997975f61c19.zip | |
travis/build.sh: handle any version.
Diffstat (limited to 'dist/travis')
| -rwxr-xr-x | dist/travis/build.sh | 27 |
1 files changed, 6 insertions, 21 deletions
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" |