diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2014-10-31 16:48:00 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2014-11-04 17:28:42 +0100 |
| commit | 511f82398e1cf8fb368be0668b69a19906810484 (patch) | |
| tree | bf0a6cfe17609c9b81d17c12d38b36c357aa43e3 | |
| parent | ae6685fe4fb35d751fd56658517ac07068e52b3f (diff) | |
abuild: fix cross compiler test
Actually abort if a cross compiler is missing, but also handle
subarchitectures (currently: armv4 and armv7 for arm)
properly.
Change-Id: Idf37fb029178df6f2ac029466c66aaa2010bdbd2
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: http://review.coreboot.org/7297
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
| -rwxr-xr-x | util/abuild/abuild | 4 | ||||
| -rwxr-xr-x | util/xcompile/xcompile | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/util/abuild/abuild b/util/abuild/abuild index b72e2127a8..72606c185b 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -286,8 +286,8 @@ function build_target create_buildenv $VENDOR $MAINBOARD $CONFIG required_arches=`egrep "^CONFIG_ARCH_(BOOTBLOCK|R.MSTAGE)" $TARGET/${VENDOR}_${MAINBOARD}/config.build | \ - sed "s,^CONFIG_ARCH_[^_]*_\([^=]*\)=.*$,\1," |sort -u |tr 'A-Z' 'a-z'` - missing_arches=`printf 'include .xcompile\nall: ; @echo $(foreach arch,'$required_arches',$(if $(filter $(arch),$(ARCH_SUPPORTED)),,$(arch)))' | make -f -` + sed "s,^CONFIG_ARCH_[^_]*_\([^=]*\)=.*$,\1," |sort -u |tr 'A-Z\n\r' 'a-z '` + missing_arches=`printf 'include .xcompile\nall: ; @echo $(foreach arch,'"$required_arches"',$(if $(filter $(arch),$(SUBARCH_SUPPORTED)),,$(arch)))' | make -f -` if [ -n "$missing_arches" ]; then printf "skipping $VENDOR/$MAINBOARD because we're missing compilers for ($missing_arches)\n" return diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index e498cc0829..7bb6e4c93d 100755 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -151,6 +151,7 @@ report_arch_toolchain() { cat <<EOF # elf${TWIDTH}-${TBFDARCH} toolchain (${GCCPREFIX}gcc) ARCH_SUPPORTED+=${TARCH} +SUBARCH_SUPPORTED+=${TSUPP-${TARCH}} CC_${TARCH}:=${GCCPREFIX}gcc CFLAGS_${TARCH}:=${CFLAGS} CPP_${TARCH}:=${GCCPREFIX}cpp @@ -174,6 +175,7 @@ arch_config_arm() { TBFDARCH="littlearm" TCLIST="armv7a armv7-a" TWIDTH="32" + TSUPP="arm armv4 armv7" TABI="eabi" } |