[coreboot-gerrit] New patch to review for coreboot: buildgcc: Be less restrictive when trying to build GNAT

[Nico Huber (nico.h@gmx.de)]

Nico Huber (nico.h at gmx.de) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17706

-gerrit

commit d9bfc47d7201001b7570f9a7d2e22b7257122bd5
Author: Nico Huber <nico.h at gmx.de>
Date:   Sun Dec 4 02:45:58 2016 +0100

    buildgcc: Be less restrictive when trying to build GNAT
    
    It turned out that newer GNAT versions can build our current (5.3.0)
    GNAT without bootstrapping. So adapt the version enforcement.
    
    Change-Id: Ie7189e8bcadeee56cf5c2172e8c0ae7cd534685a
    Signed-off-by: Nico Huber <nico.h at gmx.de>
---
 util/crossgcc/buildgcc | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 949e17c..b95d7cb 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -210,6 +210,10 @@ buildcc_major() {
 	echo "${GCC_VERSION}" | cut -d. -f1
 }
 
+buildcc_minor() {
+	echo "${GCC_VERSION}" | cut -d. -f2
+}
+
 buildcc_version() {
 	echo "${GCC_VERSION}" | cut -d. -f1-2
 }
@@ -236,9 +240,14 @@ ada_requested() {
 
 check_gnat() {
 	if hostcc_has_gnat1; then
-		if [ "$(hostcc_version)" != "$(buildcc_version)" -a "${BOOTSTRAP}" != "1" ]; then
+		if [ \( "$(hostcc_major)" -lt "$(buildcc_major)" -o \
+			\( "$(hostcc_major)" -eq "$(buildcc_major)" -a \
+			   "$(hostcc_minor)" -lt "$(buildcc_minor)" \) \) \
+			-a \
+			"${BOOTSTRAP}" != "1" ]; \
+		then
 			printf "\n${RED}ERROR:${red} Building the Ada compiler (gnat $(buildcc_version)) "
-			printf "with a different host compiler\n       version ($(hostcc_version)) "
+			printf "with an older host compiler\n       version ($(hostcc_version)) "
 			printf "requires bootstrapping (-b).${NC}\n\n"
 			HALT_FOR_TOOLS=1
 		fi