summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2017-03-12 23:12:49 +0100
committerPatrick Georgi <pgeorgi@google.com>2017-03-23 18:41:21 +0100
commitd5829e9bdb1f23263d63b6fb033a5737f9d13f7c (patch)
treeaa35ee47ac64e820ff295f9008115b2c51c4030e /util
parentcdf79e6a8d91e66942cd6f617ab0bf222ae19b54 (diff)
downloadcoreboot-d5829e9bdb1f23263d63b6fb033a5737f9d13f7c.tar.xz
buildgcc: Relax GNAT version checks
Compiling the GNAT frontend of GCC seems to have stabilized since GCC 4.9.0. So build it by default if GNAT >= 4.9 is installed. TEST=Bootstrapped all GCC versions from 4.9.0 to 6.2 and built the i386 cross toolchain with each. Change-Id: I9d1127595dc6b9bcece9c5e5cc7e45f467744ab9 Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/18777 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'util')
-rwxr-xr-xutil/crossgcc/buildgcc14
1 files changed, 7 insertions, 7 deletions
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index b8d4746f7b..3ebde85892 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -241,14 +241,12 @@ ada_requested() {
check_gnat() {
if hostcc_has_gnat1; then
- if [ \( "$(hostcc_major)" -lt "$(buildcc_major)" -o \
- \( "$(hostcc_major)" -eq "$(buildcc_major)" -a \
- "$(hostcc_minor)" -lt "$(buildcc_minor)" \) \) \
- -a \
- "${BOOTSTRAP}" != "1" ]; \
+ if [ \( "$(hostcc_major)" -lt 4 -o \
+ \( "$(hostcc_major)" -eq 4 -a "$(hostcc_minor)" -lt 9 \) \) -a \
+ "${BOOTSTRAP}" != "1" ];
then
printf "\n${RED}ERROR:${red} Building the Ada compiler (gnat $(buildcc_version)) "
- printf "with an older host compiler\n version ($(hostcc_version)) "
+ printf "with a host compiler older\n than 4.9.x (yours $(hostcc_version)) "
printf "requires bootstrapping (-b).${NC}\n\n"
HALT_FOR_TOOLS=1
fi
@@ -953,7 +951,9 @@ elif [ $UNAME = "NetBSD" ]; then
fi
if [ -z "${LANGUAGES}" ]; then
if hostcc_has_gnat1 && \
- [ "$(hostcc_version)" = "$(buildcc_version)" -o "${BOOTSTRAP}" = "1" ];
+ [ "$(hostcc_major)" -ge 5 -o \
+ \( "$(hostcc_major)" -eq 4 -a "$(hostcc_minor)" -ge 9 \) -o \
+ "${BOOTSTRAP}" = "1" ];
then
printf "\nFound compatible Ada compiler, enabling Ada support by default.\n\n"
LANGUAGES="ada,${DEFAULT_LANGUAGES}"