aboutsummaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2016-12-12 03:55:23 +0100
committerTristan Gingold <tgingold@free.fr>2016-12-12 03:55:23 +0100
commit5ccabe2c5f9d88b8f3065cafc8c156b35f5fb502 (patch)
treefd06b28fb132b9d5c611bdd3efa5a9571c08b12c /dist
parent9544b52efb2f48d3031a1f1bc9070f0e4c164864 (diff)
downloadghdl-5ccabe2c5f9d88b8f3065cafc8c156b35f5fb502.tar.gz
ghdl-5ccabe2c5f9d88b8f3065cafc8c156b35f5fb502.tar.bz2
ghdl-5ccabe2c5f9d88b8f3065cafc8c156b35f5fb502.zip
travis: set CLANGXX in make command
Diffstat (limited to 'dist')
-rwxr-xr-xdist/travis-ci.sh21
1 files changed, 12 insertions, 9 deletions
diff --git a/dist/travis-ci.sh b/dist/travis-ci.sh
index 3a8194cdc..ce943c62e 100755
--- a/dist/travis-ci.sh
+++ b/dist/travis-ci.sh
@@ -20,21 +20,24 @@ cd build-$BLD
# Configure
case "$BLD" in
mcode)
- ../configure --prefix="$prefix" ;;
+ ../configure --prefix="$prefix"
+ MAKEOPTS=""
+ ;;
- llvm-*)
- llvm_ver=`echo $BLD | sed -e 's/llvm-//'`
- ../configure --prefix="$prefix" --with-llvm-config=llvm-config-$llvm_ver
- ;;
+ llvm*)
+ llvm_ver=`echo $BLD | sed -e 's/llvm//'`
+ ../configure --prefix="$prefix" --with-llvm-config=llvm-config$llvm_ver
+ MAKEOPTS="CLANGXX=clang++$llvm_ver"
+ ;;
*)
- echo "unknown build $BLD"
- exit 1
- ;;
+ echo "unknown build $BLD"
+ exit 1
+ ;;
esac
# Build
-make
+make $MAKEOPTS
make install
cd ..