diff options
| -rwxr-xr-x | dist/linux/travis-ci.sh | 9 | ||||
| -rw-r--r-- | src/ghdldrv/ghdllocal.adb | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/dist/linux/travis-ci.sh b/dist/linux/travis-ci.sh index 93e7241ba..b8db1ddc7 100755 --- a/dist/linux/travis-ci.sh +++ b/dist/linux/travis-ci.sh @@ -71,12 +71,13 @@ else PKG_TAG="$TRAVIS_TAG" fi +# Extract from IMAGE (defined in .travis.yml) IFS='+' read -ra REFS <<< "$IMAGE" -DDIST=${REFS[0]} -DBLD=${REFS[1]} -DGPL=${REFS[2]} +DDIST=${REFS[0]} # Linux distro (eg: ubuntuXX, fedoraXX) +DBLD=${REFS[1]} # Build/backend (eg: mcode, llvm) +DGPL=${REFS[2]} # GPL or not -PKG_NAME="ghdl-${PKG_TAG}-${DBLD}-${DDIST}" +PKG_NAME="ghdl-${PKG_TAG}-${DDIST}-${DBLD}" BUILD_CMD_OPTS="$ENABLECOLOR -b $DBLD" if [ "$DGPL" = "gpl" ]; then BUILD_CMD_OPTS="$BUILD_CMD_OPTS --gpl" diff --git a/src/ghdldrv/ghdllocal.adb b/src/ghdldrv/ghdllocal.adb index cf708d288..52777ff26 100644 --- a/src/ghdldrv/ghdllocal.adb +++ b/src/ghdldrv/ghdllocal.adb @@ -212,7 +212,7 @@ package body Ghdllocal is -- Simplify path: -- /xxx/../ => / -- Do it forward as xxx/../../ must not be simplified as xxx/ - -- This is done after the previous simplication to avoid to deal + -- This is done after the previous simplification to avoid to deal -- with cases like /xxx//../ or /xxx/./../ Pos := Pathname'First; while Pos <= Last - 3 loop |