diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2017-04-26 06:47:33 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2017-04-26 06:47:33 +0300 |
| commit | 275b4b981b44581fcb5e3e77333376e1eb3dc2e2 (patch) | |
| tree | a2f7947cff9e0898066504a9e643f12178d729e5 | |
| parent | 98e04eab9812876e2c10cfd1e4afd859b09b5cf7 (diff) | |
| parent | 8972aa34f007e12c3eb3270b79d39403d80a542f (diff) | |
| download | egawk-275b4b981b44581fcb5e3e77333376e1eb3dc2e2.tar.gz egawk-275b4b981b44581fcb5e3e77333376e1eb3dc2e2.tar.bz2 egawk-275b4b981b44581fcb5e3e77333376e1eb3dc2e2.zip | |
Merge branch 'master' into feature/api-mpfr
| -rw-r--r-- | helpers/ChangeLog | 6 | ||||
| -rwxr-xr-x | helpers/test-build.sh | 21 |
2 files changed, 18 insertions, 9 deletions
diff --git a/helpers/ChangeLog b/helpers/ChangeLog index df0741c9..ce3fd9ca 100644 --- a/helpers/ChangeLog +++ b/helpers/ChangeLog @@ -1,3 +1,9 @@ +2017-04-26 Arnold D. Robbins <arnold@skeeve.com> + + * test-build.sh: Allow override of compiler lists. Print + out path to current compiler. Thanks to Michal Jaegermann + <michal.jnn@gmail.com> for the suggestions. + 2017-04-24 Arnold D. Robbins <arnold@skeeve.com> * test-build.sh: New file. diff --git a/helpers/test-build.sh b/helpers/test-build.sh index ce4aab50..3ed20ec1 100755 --- a/helpers/test-build.sh +++ b/helpers/test-build.sh @@ -1,7 +1,7 @@ -#! /bin/sh +#! /bin/bash -MIXED_COMPILERS="gcc /usr/gcc/bin/gcc clang" -OTHER_COMPILERS="tcc pcc" +MIXED_COMPILERS=${MIXED_COMPILERS:-gcc /usr/gcc/bin/gcc clang} +OTHER_COMPILERS=${OTHER_COMPILERS:-tcc pcc} rm -f compile-results.txt @@ -16,12 +16,15 @@ compile () { } configure_and_compile () { - for j in "" --disable-mpfr - do - ./configure $j CC="$1" - compile "$1" "$j" - done - make distclean + if type -p $1 >> compile-results.txt 2>&1 + then + for j in "" --disable-mpfr + do + ./configure $j CC="$1" + compile "$1" "$j" + make distclean + done + fi } (make distclean) |