From dc760142d5080c1fef22090cb501547aa9aec72a Mon Sep 17 00:00:00 2001 From: Geunsik Lim Date: Tue, 8 Mar 2016 13:30:21 +0900 Subject: [PATCH] ARM: skip generating native image for mscorlib in case of cross build We need to skip generating native image for mscorlib in build_mscorlib() of ./coreclr/build.sh when we do cross build for Linux/ARM on Ubuntu 14.04 x86 64bit PC. Signed-off-by: Geunsik Lim geunsik.lim@samsung.com Signed-off-by: Prajwal A N an.prajwal@samsung.com Signed-off-by: MyungJoo Ham myungjoo.ham@samsung.com Commit migrated from https://github.com/dotnet/coreclr/commit/fb3448819c2905605c223a6edbd57990f4eb248c --- src/coreclr/build.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh index e72db44..0c1271a 100755 --- a/src/coreclr/build.sh +++ b/src/coreclr/build.sh @@ -245,14 +245,16 @@ build_mscorlib() exit 1 fi - if [ $__SkipCoreCLR == 0 -a -e $__BinDir/crossgen ]; then - echo "Generating native image for mscorlib." - $__BinDir/crossgen $__BinDir/mscorlib.dll - if [ $? -ne 0 ]; then - echo "Failed to generate native image for mscorlib." - exit 1 - fi - fi + if [ $__CrossBuild != 1 ]; then + if [ $__SkipCoreCLR == 0 -a -e $__BinDir/crossgen ]; then + echo "Generating native image for mscorlib." + $__BinDir/crossgen $__BinDir/mscorlib.dll + if [ $? -ne 0 ]; then + echo "Failed to generate native image for mscorlib." + exit 1 + fi + fi + fi } generate_NugetPackages() -- 2.7.4