[coreboot-gerrit] Change in coreboot[master]: buildgcc: Relax GNAT version checks

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/18777 )

Change subject: buildgcc: Relax GNAT version checks
......................................................................


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 at gmx.de>
Reviewed-on: https://review.coreboot.org/18777
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter at users.sourceforge.net>
Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude at gmail.com>
Reviewed-by: Patrick Georgi <pgeorgi at google.com>
---
M util/crossgcc/buildgcc
1 file changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Philippe Mathieu-Daudé: Looks good to me, but someone else must approve
  Paul Menzel: Looks good to me, but someone else must approve
  build bot (Jenkins): Verified
  Patrick Georgi: Looks good to me, approved



diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index b8d4746..3ebde85 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -241,14 +241,12 @@
 
 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 @@
 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}"

-- 
To view, visit https://review.coreboot.org/18777
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d1127595dc6b9bcece9c5e5cc7e45f467744ab9
Gerrit-PatchSet: 2
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Nico Huber <nico.h at gmx.de>
Gerrit-Reviewer: Martin Roth <martinroth at google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi at google.com>
Gerrit-Reviewer: Paul Menzel <paulepanter at users.sourceforge.net>
Gerrit-Reviewer: Philippe Mathieu-Daudé <philippe.mathieu.daude at gmail.com>
Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer at coreboot.org>
Gerrit-Reviewer: build bot (Jenkins)