aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2016-12-11 16:16:24 +0100
committerTristan Gingold <tgingold@free.fr>2016-12-11 16:16:24 +0100
commitbfa23dda0cbf47df1af54f1ba3b2b650989a9c77 (patch)
tree43d59d18619af1871814e49c55917e2fd3a54b60
parent93a8fd07f647cea6b130dda37c9093022f000ac1 (diff)
downloadghdl-bfa23dda0cbf47df1af54f1ba3b2b650989a9c77.tar.gz
ghdl-bfa23dda0cbf47df1af54f1ba3b2b650989a9c77.tar.bz2
ghdl-bfa23dda0cbf47df1af54f1ba3b2b650989a9c77.zip
travis: build with llvm-3.8 (test)
-rw-r--r--.travis.yml13
-rwxr-xr-xdist/travis-ci.sh6
2 files changed, 16 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 3eba03981..52d9b0d7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ matrix:
- os: linux
sudo: required
dist: trusty
- env: BLD=llvm
+ env: BLD=llvm-3.5
before_install:
- sudo apt-get update -qq
- sudo apt-get install -y gnat-4.8 zlib1g-dev
@@ -16,6 +16,17 @@ matrix:
apt:
packages:
- gnat
+ - os: linux
+ sudo: false
+ env: BLD=llvm-3.8
+ addons:
+ apt:
+ packages:
+ - gnat-6
+ - llvm-3.8-dev
+ - llvm-3.8-tools
+ - libedit-dev
+ - zlib1g-dev
script: ./dist/travis-ci.sh $BLD
deploy:
provider: releases
diff --git a/dist/travis-ci.sh b/dist/travis-ci.sh
index d2ca5787e..3a8194cdc 100755
--- a/dist/travis-ci.sh
+++ b/dist/travis-ci.sh
@@ -22,8 +22,10 @@ case "$BLD" in
mcode)
../configure --prefix="$prefix" ;;
- llvm)
- ../configure --prefix="$prefix" --with-llvm-config=llvm-config-3.5 ;;
+ llvm-*)
+ llvm_ver=`echo $BLD | sed -e 's/llvm-//'`
+ ../configure --prefix="$prefix" --with-llvm-config=llvm-config-$llvm_ver
+ ;;
*)
echo "unknown build $BLD"