summaryrefslogtreecommitdiff
path: root/build-test.sh
diff options
context:
space:
mode:
authorSergiy Kuryata <sergeyk@microsoft.com>2019-04-11 16:54:49 (GMT)
committerSergiy Kuryata <sergeyk@microsoft.com>2019-04-12 07:08:14 (GMT)
commit30a7c538ae15302f8c09ba334a838c09ef5b0257 (patch)
treedd4b165fe77ef166c9cb296286f6eef297e64a37 /build-test.sh
parent1660956bca91b93259393419cb169a10df088926 (diff)
downloadcoreclr-30a7c538ae15302f8c09ba334a838c09ef5b0257.zip
coreclr-30a7c538ae15302f8c09ba334a838c09ef5b0257.tar.gz
coreclr-30a7c538ae15302f8c09ba334a838c09ef5b0257.tar.bz2
Enable precompiling CoreRoot overlay with crossgen for Linux arm/arm64
Diffstat (limited to 'build-test.sh')
-rwxr-xr-xbuild-test.sh7
1 files changed, 2 insertions, 5 deletions
diff --git a/build-test.sh b/build-test.sh
index 96e6959..b6224a4 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