diff options
| author | eine <6628437+eine@users.noreply.github.com> | 2020-01-08 19:38:07 +0000 |
|---|---|---|
| committer | tgingold <tgingold@users.noreply.github.com> | 2020-01-08 20:38:07 +0100 |
| commit | 91e5fab3e69fdcdbc04c3280c3ab9f3c8c8d5c51 (patch) | |
| tree | 83e894c1e49fee3fa6df69a9031942156ae02522 /dist/ci-run.sh | |
| parent | e754d848f8c8864b4ad5eee38ded84be8f3609bf (diff) | |
| download | ghdl-91e5fab3e69fdcdbc04c3280c3ab9f3c8c8d5c51.tar.gz ghdl-91e5fab3e69fdcdbc04c3280c3ab9f3c8c8d5c51.tar.bz2 ghdl-91e5fab3e69fdcdbc04c3280c3ab9f3c8c8d5c51.zip | |
ci: update installation of GNAT GPL on macOS (#1072)
* ci: move 'install-ada' to YAML files
* ci: update Xcode to 10
* ci: update GNAT to 2019
Diffstat (limited to 'dist/ci-run.sh')
| -rwxr-xr-x | dist/ci-run.sh | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/dist/ci-run.sh b/dist/ci-run.sh index d6061edb2..722b0d1c4 100755 --- a/dist/ci-run.sh +++ b/dist/ci-run.sh @@ -388,14 +388,6 @@ ci_run () { git fetch --unshallow || true gend - if [ "x$IS_MACOS" = "xtrue" ]; then - gstart "[CI] Install gnat compiler (use cache) and set CPATH" "$ANSI_BLUE" - ./dist/macosx/install-ada.sh || exit 1 - PATH=$PWD/gnat/bin:$PATH - export CPATH="$CPATH:`xcrun --show-sdk-path`/usr/include" - gend - fi - # Get build command options gstart "[CI] Get build command options" "$ANSI_BLUE" buildCmdOpts "$TASK" @@ -406,7 +398,10 @@ ci_run () { RUN="docker run --rm -t -e CI -e TRAVIS -v `pwd`:/work -w /work" if [ "x$IS_MACOS" = "xtrue" ]; then - CC=clang CONFIG_OPTS="--disable-libghdl" bash -c "${scriptdir}/ci-run.sh $BUILD_CMD_OPTS build" + export CPATH="$CPATH:`xcrun --show-sdk-path`/usr/include" + CC=clang \ + CONFIG_OPTS="--disable-libghdl" \ + bash -c "${scriptdir}/ci-run.sh $BUILD_CMD_OPTS build" else # Assume linux @@ -435,7 +430,9 @@ ci_run () { # Test if [ "x$IS_MACOS" = "xtrue" ]; then - CC=clang prefix="`cd ./install-mcode; pwd`" ./testsuite/testsuite.sh sanity gna vests + CC=clang \ + prefix="`cd ./install-mcode; pwd`" \ + ./testsuite/testsuite.sh sanity gna vests else # Build ghdl/ghdl:$GHDL_IMAGE_TAG image build_img_ghdl |