GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@gmx.de>
Reviewed-on: https://review.coreboot.org/17706
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Nico Huber 2016-12-04 02:45:58 +01:00
parent aa89fb4618
commit 26267a7a41
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
util/crossgcc/buildgcc
View File

@ -211,6 +211,10 @@ buildcc_major() {
echo "${GCC_VERSION}" | cut -d. -f1 echo "${GCC_VERSION}" | cut -d. -f1
} }
buildcc_minor() {
echo "${GCC_VERSION}" | cut -d. -f2
}
buildcc_version() { buildcc_version() {
echo "${GCC_VERSION}" | cut -d. -f1-2 echo "${GCC_VERSION}" | cut -d. -f1-2
} }
@ -237,9 +241,14 @@ ada_requested() {
check_gnat() { check_gnat() {
if hostcc_has_gnat1; then 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 "\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" printf "requires bootstrapping (-b).${NC}\n\n"
HALT_FOR_TOOLS=1 HALT_FOR_TOOLS=1
fi fi