summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorEgor Chesakov <Egor.Chesakov@microsoft.com>2018-09-13 18:39:26 -0700
committerEgor Chesakov <Egor.Chesakov@microsoft.com>2018-09-13 18:39:26 -0700
commit93f2a9f8865bf2a7533c94fe7b2cafe4eddd46c5 (patch)
tree4bc68e05284c3ebf287f7154504e7f01dc04a78c /build.sh
parent429d1c86b6cbdab1bd220276d6baee6e47cfd64f (diff)
downloadcoreclr-93f2a9f8865bf2a7533c94fe7b2cafe4eddd46c5.tar.gz
coreclr-93f2a9f8865bf2a7533c94fe7b2cafe4eddd46c5.tar.bz2
coreclr-93f2a9f8865bf2a7533c94fe7b2cafe4eddd46c5.zip
Use Hostx64/arm crossgen by default on Linux
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index e59cf445a3..2dfcf5d748 100755
--- a/build.sh
+++ b/build.sh
@@ -502,9 +502,8 @@ build_CoreLib()
elif [ $__DoCrossArchBuild == 1 ]; then
if [[ ( "$__CrossArch" == "x86" ) && ( "$__BuildArch" == "arm" ) ]]; then
build_CoreLib_ni "$__CrossComponentBinDir/crossgen"
- elif [[ ( "$__HostArch" == "x64" ) && ( "$__BuildArch" == "arm" ) ]]; then
- # For now, continue to use Hostx86/arm crossgen to crossgen System.Private.CoreLib.dll
- build_CoreLib_ni "$__BinDir/x86/crossgen"
+ elif [[ ( "$__CrossArch" == "x64" ) && ( "$__BuildArch" == "arm" ) ]]; then
+ build_CoreLib_ni "$__CrossComponentBinDir/crossgen"
elif [[ ( "$__HostArch" == "x64" ) && ( "$__BuildArch" == "arm64" ) ]]; then
build_CoreLib_ni "$__CrossComponentBinDir/crossgen"
fi