diff options
| author | eine <6628437+eine@users.noreply.github.com> | 2020-01-20 20:56:17 +0100 |
|---|---|---|
| committer | tgingold <tgingold@users.noreply.github.com> | 2020-01-20 20:56:17 +0100 |
| commit | caed711f6b933eb8ca3e2d8e458824b2b20f6b3b (patch) | |
| tree | 9b6dcde5335100796aaac40e7dc6e9cb19bda850 /dist | |
| parent | 87d9089e9ad2f32b8e355c6a519726247f19cde0 (diff) | |
| download | ghdl-caed711f6b933eb8ca3e2d8e458824b2b20f6b3b.tar.gz ghdl-caed711f6b933eb8ca3e2d8e458824b2b20f6b3b.tar.bz2 ghdl-caed711f6b933eb8ca3e2d8e458824b2b20f6b3b.zip | |
ci: use DESTDIR instead of PREFIX (#1104)
Diffstat (limited to 'dist')
| -rwxr-xr-x | dist/ci-run.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/dist/ci-run.sh b/dist/ci-run.sh index da92c743a..5750a2b76 100755 --- a/dist/ci-run.sh +++ b/dist/ci-run.sh @@ -248,8 +248,8 @@ build () { #--- Configure CDIR=`pwd` - export prefix="$CDIR/install-$BACK" - mkdir "$prefix" + INSTALL_DIR="$CDIR/install-$BACK" + mkdir "$INSTALL_DIR" mkdir "build-$BACK" cd "build-$BACK" @@ -271,14 +271,14 @@ build () { gend gstart "[GHDL - build] Configure ghdl" - run_cmd ../configure --with-gcc=gcc-srcs --prefix="$prefix" $CONFIG_OPTS + run_cmd ../configure --with-gcc=gcc-srcs $CONFIG_OPTS gend gstart "[GHDL - build] Copy sources" make copy-sources mkdir gcc-objs; cd gcc-objs gend gstart "[GHDL - build] Configure gcc" - run_cmd ../gcc-srcs/configure --prefix="$prefix" --enable-languages=c,vhdl --disable-bootstrap --disable-lto --disable-multilib --disable-libssp --disable-libgomp --disable-libquadmath "`gcc -v 2>&1 | grep -o -- --enable-default-pie`" + run_cmd ../gcc-srcs/configure --enable-languages=c,vhdl --disable-bootstrap --disable-lto --disable-multilib --disable-libssp --disable-libgomp --disable-libquadmath "`gcc -v 2>&1 | grep -o -- --enable-default-pie`" gend ;; mcode) @@ -304,7 +304,7 @@ build () { if [ ! "`echo $BACK | grep gcc`" ]; then gstart "[GHDL - build] Configure" - run_cmd ../configure "--prefix=$prefix" $CONFIG_OPTS + run_cmd ../configure $CONFIG_OPTS gend fi @@ -318,17 +318,17 @@ build () { gend gstart "[GHDL - build] Install" - make install + make DESTDIR="$INSTALL_DIR" install cd .. gend if [ "`echo $BACK | grep gcc`" ]; then gstart "[GHDL - build] Make ghdllib" - make ghdllib + make DESTDIR="$INSTALL_DIR" ghdllib gend gstart "[GHDL - build] Install ghdllib" - make install + make DESTDIR="$INSTALL_DIR" install cd .. gend fi @@ -336,7 +336,7 @@ build () { #--- package gstart "[GHDL - build] Create package ${ANSI_DARKCYAN}${PKG_NAME}.tgz" - tar -zcvf "${PKG_NAME}.tgz" -C "$prefix" . + tar -zcvf "${PKG_NAME}.tgz" -C "$INSTALL_DIR/usr/local" . gend #--- build tools versions @@ -432,7 +432,7 @@ ci_run () { if [ "x$IS_MACOS" = "xtrue" ]; then CC=clang \ - prefix="`cd ./install-mcode; pwd`" \ + prefix="`cd ./install-mcode; pwd`/usr/local" \ ./testsuite/testsuite.sh sanity gna vests else # Build ghdl/ghdl:$GHDL_IMAGE_TAG image |