Centos 7.7 only provides cross GCC 4.8.5, but the script forces
us to use GCC5. Since the same machinery is valid to check the
GCC version, remove the $emulation_target check.
$ cat /etc/redhat-release
CentOS Linux release 7.7.1908 (Core)
$ aarch64-linux-gnu-gcc -v 2>&1 | tail -1
gcc version 4.8.5 20150623 (Red Hat 4.8.5-16) (GCC)
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
---
Patch to review with --ignore-all-space
---
roms/edk2-funcs.sh | 48 +++++++++++++++++++---------------------------
1 file changed, 20 insertions(+), 28 deletions(-)
diff --git a/roms/edk2-funcs.sh b/roms/edk2-funcs.sh
index 3f4485b201..a455611c0d 100644
--- a/roms/edk2-funcs.sh
+++ b/roms/edk2-funcs.sh
@@ -135,35 +135,27 @@ qemu_edk2_get_toolchain()
return 1
fi
- case "$emulation_target" in
- (arm|aarch64)
- printf 'GCC5\n'
+ if ! cross_prefix=$(qemu_edk2_get_cross_prefix "$emulation_target"); then
+ return 1
+ fi
+
+ gcc_version=$("${cross_prefix}gcc" -v 2>&1 | tail -1 | awk '{print $3}')
+ # Run "git-blame" on "OvmfPkg/build.sh" in edk2 for more information on
+ # the mapping below.
+ case "$gcc_version" in
+ ([1-3].*|4.[0-7].*)
+ printf '%s: unsupported gcc version "%s"\n' \
+ "$program_name" "$gcc_version" >&2
+ return 1
;;
-
- (i386|x86_64)
- if ! cross_prefix=$(qemu_edk2_get_cross_prefix "$emulation_target"); then
- return 1
- fi
-
- gcc_version=$("${cross_prefix}gcc" -v 2>&1 | tail -1 | awk '{print $3}')
- # Run "git-blame" on "OvmfPkg/build.sh" in edk2 for more information on
- # the mapping below.
- case "$gcc_version" in
- ([1-3].*|4.[0-7].*)
- printf '%s: unsupported gcc version "%s"\n' \
- "$program_name" "$gcc_version" >&2
- return 1
- ;;
- (4.8.*)
- printf 'GCC48\n'
- ;;
- (4.9.*|6.[0-2].*)
- printf 'GCC49\n'
- ;;
- (*)
- printf 'GCC5\n'
- ;;
- esac
+ (4.8.*)
+ printf 'GCC48\n'
+ ;;
+ (4.9.*|6.[0-2].*)
+ printf 'GCC49\n'
+ ;;
+ (*)
+ printf 'GCC5\n'
;;
esac
}
--
2.21.0
