diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | dist/travis-ci.sh | 21 |
2 files changed, 12 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 786ee5a17..7da46d32e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ matrix: dist: precise env: - BLD=llvm-3.8 - - CLANGXX=clang++-3.8 addons: apt: sources: 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 .. |