aboutsummaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2016-01-14 21:38:15 +0100
committerTristan Gingold <tgingold@free.fr>2016-01-14 21:38:15 +0100
commit22944c2dca55a62d86eb3a6d7ce0d576731141ca (patch)
treed131959577ab9ddcaa59e9887d76e711d9ae3798 /dist
parentdac6746d21480b5f60e0260d280cc22a6c7d72ea (diff)
downloadghdl-22944c2dca55a62d86eb3a6d7ce0d576731141ca.tar.gz
ghdl-22944c2dca55a62d86eb3a6d7ce0d576731141ca.tar.bz2
ghdl-22944c2dca55a62d86eb3a6d7ce0d576731141ca.zip
travis: fix mcode build.
Diffstat (limited to 'dist')
-rwxr-xr-xdist/travis-ci.sh11
1 files changed, 5 insertions, 6 deletions
diff --git a/dist/travis-ci.sh b/dist/travis-ci.sh
index cc0bbc3e8..d0f356b8e 100755
--- a/dist/travis-ci.sh
+++ b/dist/travis-ci.sh
@@ -7,19 +7,18 @@ set -e
CDIR=$PWD
# Prepare
+prefix="$CDIR/install-$1"
+mkdir "$prefix"
mkdir build-$1
-mkdir install-$1
cd build-$1
# Configure
case "$1" in
mcode)
- ../configure --prefix=$CDIR/install-mcode64
- ;;
+ ../configure --prefix="$prefix" ;;
llvm)
- ../configure --prefix=$CDIR/install-llvm --with-llvm-config=llvm-config-3.5
- ;;
+ ../configure --prefix="$prefix" --with-llvm-config=llvm-config-3.5 ;;
*)
echo "unknown build $1"
@@ -33,7 +32,7 @@ make install
cd ..
# Test
-export GHDL=$CDIR/install-$1/bin/ghdl
+export GHDL="$CDIR/install-$1/bin/ghdl"
cd testsuite
gnatmake get_entities
./testsuite.sh