From 30a7c538ae15302f8c09ba334a838c09ef5b0257 Mon Sep 17 00:00:00 2001
From: Sergiy Kuryata <sergeyk@microsoft.com>
Date: Thu, 11 Apr 2019 09:54:49 -0700
Subject: Enable precompiling CoreRoot overlay with crossgen for Linux
 arm/arm64

---
 build-test.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'build-test.sh')

diff --git a/build-test.sh b/build-test.sh
index 96e6959746..b6224a4b38 100755
--- a/build-test.sh
+++ b/build-test.sh
@@ -150,7 +150,7 @@ generate_layout()
     build_MSBuild_projects "Tests_Overlay_Managed" "${__ProjectDir}/tests/runtest.proj" "Creating test overlay" "/t:CreateTestOverlay"
 
     chmod +x $__BinDir/corerun
-    chmod +x $__BinDir/crossgen
+    chmod +x $__CrossgenExe
 
     # Make sure to copy over the pulled down packages
     cp -r $__BinDir/* $CORE_ROOT/ > /dev/null
@@ -185,7 +185,7 @@ precompile_coreroot_fx()
                 continue
         fi
         echo Precompiling $filename
-        $overlayDir/crossgen /Platform_Assemblies_Paths $overlayDir $filename 1> $filename.stdout 2>$filename.stderr
+        $__CrossgenExe /Platform_Assemblies_Paths $overlayDir $filename 1> $filename.stdout 2>$filename.stderr
         local exitCode=$?
         if [[ $exitCode != 0 ]]; then
             if grep -q -e '0x80131018' $filename.stderr; then
@@ -965,9 +965,6 @@ __CrossComponentBinDir="$__BinDir"
 __CrossCompIntermediatesDir="$__IntermediatesDir/crossgen"
 
 __CrossArch="$__HostArch"
-if [[ "$__HostArch" == "x64" && "$__BuildArch" == "arm" ]]; then
-    __CrossArch="x86"
-fi
 if [ $__CrossBuild == 1 ]; then
     __CrossComponentBinDir="$__CrossComponentBinDir/$__CrossArch"
 fi
-- 
cgit v1.2.3