[PATCH 5/5] OvmfPkg/build.sh: Add a cross compiler prefix for AARCH64/ARM

["Jordan Justen" <jordan.l.justen@intel.com>]

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
 OvmfPkg/build.sh | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
index 9d787452b5..e1a708942b 100755
--- a/OvmfPkg/build.sh
+++ b/OvmfPkg/build.sh
@@ -103,9 +103,6 @@ do
   shift
 done
 
-export GCC5_AARCH64_PREFIX=aarch64-linux-gnu-
-export GCC5_ARM_PREFIX=arm-linux-gnueabihf-
-
 if [[ "$ARCH_AARCH64" == "yes" ]]; then
   PROCESSOR=AARCH64
   Processor=AArch64
@@ -138,6 +135,23 @@ else
   BUILD_ROOT_ARCH=X64
 fi
 
+GCC_CROSS_PREFIX=
+gcc_machine=$(gcc -dumpmachine 2>&1 | awk -F - '{print $1}')
+case $gcc_machine in
+  x86_64)
+    case $BUILD_ROOT_ARCH in
+      AARCH64)
+	GCC_CROSS_PREFIX=aarch64-linux-gnu-
+        ;;
+      ARM)
+	GCC_CROSS_PREFIX=arm-linux-gnueabihf-
+        ;;
+    esac
+    ;;
+esac
+
+GCC=${GCC_CROSS_PREFIX}gcc
+
 #
 # Pick a default tool type for a given OS
 #
@@ -169,7 +183,7 @@ if [ -z "$TARGET_TOOLS" ]; then
       esac
       ;;
     Linux*)
-      gcc_version=$(gcc -v 2>&1 | tail -1 | awk '{print $3}')
+      gcc_version=$($GCC -v 2>&1 | tail -1 | awk '{print $3}')
       case $gcc_version in
         [1-3].*|4.[0-7].*)
           echo OvmfPkg requires GCC4.8 or later
@@ -188,6 +202,10 @@ if [ -z "$TARGET_TOOLS" ]; then
   esac
 fi
 
+if [ -n "${GCC_CROSS_PREFIX}" ]; then
+  export ${TARGET_TOOLS}_${BUILD_ROOT_ARCH}_PREFIX=${GCC_CROSS_PREFIX}
+fi
+
 case $PROCESSOR in
   AARCH64)
     if [ -z "$QEMU_COMMAND" ]; then
-- 
2.20.1