diff options
| -rw-r--r-- | functions.sh.in | 2 | ||||
| -rw-r--r-- | tests/functions.bats | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/functions.sh.in b/functions.sh.in index 435b240..6d5181a 100644 --- a/functions.sh.in +++ b/functions.sh.in @@ -117,7 +117,7 @@ readconfig() { USE_COLORS=${_USE_COLORS-$USE_COLORS} USE_CCACHE=${_USE_CCACHE-$USE_CCACHE} - [ -z "$CBUILD" ] && CBUILD="$(gcc -dumpmachine)" + [ -z "$CBUILD" ] && CBUILD="$(${CC:-gcc} -dumpmachine 2>/dev/null || true)" [ -z "$CHOST" ] && CHOST="$CBUILD" [ -z "$CTARGET" ] && CTARGET="$CHOST" [ "$(arch_to_hostspec $CBUILD)" != "unknown" ] && CBUILD="$(arch_to_hostspec $CBUILD)" diff --git a/tests/functions.bats b/tests/functions.bats new file mode 100644 index 0000000..9ae832a --- /dev/null +++ b/tests/functions.bats @@ -0,0 +1,11 @@ +setup() { + export FUNCS=../functions.sh +} + +@test "check if CBUILD is set" { + . $FUNCS && test -n "$CBUILD" +} + +@test "check that missing gcc does not kill us" { + sh -e -c "CC=false; . $FUNCS && test -z \"$CBUILD\"" +} |