From 66c2c1a2d4eed1aa4d3aad70b8790db5a4536beb Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Tue, 20 Sep 2016 13:09:29 +0200 Subject: buildgcc: Build gnat by default if host compiler seems compatible Change-Id: I2a13e188ddb0b7d64d3c0ec979a1a493bf160afc Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/16678 Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- util/crossgcc/buildgcc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'util/crossgcc') diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 74a6261764..4883754078 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -26,7 +26,8 @@ CROSSGCC_COMMIT=$( git describe ) PACKAGE=GCC TARGETDIR=$(pwd)/xgcc TARGETARCH=i386-elf -LANGUAGES=c +DEFAULT_LANGUAGES=c +LANGUAGES= DESTDIR= SAVETEMPS=0 SKIPPYTHON=1 @@ -455,7 +456,7 @@ myhelp() printf " [-p|--platform ] target platform to build cross compiler for\n" printf " (defaults to $TARGETARCH)\n" printf " [-l|--languages ] comma separated list of target languages\n" - printf " (defaults to $LANGUAGES)\n" + printf " (defaults to $DEFAULT_LANGUAGES)\n" printf "GDB specific options:\n" printf " [-p|--platform ] target platform to build cross compiler for\n" printf " (defaults to $TARGETARCH)\n" @@ -918,6 +919,16 @@ elif [ $UNAME = "NetBSD" ]; then OPTIONS="ABI=32" fi fi +if [ -z "${LANGUAGES}" ]; then + if hostcc_has_gnat1 && \ + [ "$(hostcc_version)" = "$(buildcc_version)" -o "${BOOTSTRAP}" = "1" ]; + then + printf "\nFound compatible Ada compiler, enabling Ada support by default.\n\n" + LANGUAGES="ada,${DEFAULT_LANGUAGES}" + else + LANGUAGES="${DEFAULT_LANGUAGES}" + fi +fi fi # GCC export HOSTCFLAGS="-Os" -- cgit v1.2.3