diff options
Diffstat (limited to 'packaging/Add-Tizen-RuntimeID-case.patch')
-rw-r--r-- | packaging/Add-Tizen-RuntimeID-case.patch | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/packaging/Add-Tizen-RuntimeID-case.patch b/packaging/Add-Tizen-RuntimeID-case.patch index ea8c2f55a7..852adb4139 100644 --- a/packaging/Add-Tizen-RuntimeID-case.patch +++ b/packaging/Add-Tizen-RuntimeID-case.patch @@ -1,4 +1,4 @@ -From 318f341edd8d38ef7fef453a8724367bfb3debb6 Mon Sep 17 00:00:00 2001 +From 59b6394308dd795db0409d0aecc6790f0bee4103 Mon Sep 17 00:00:00 2001 From: Jiyoung Yun <jy910.yun@samsung.com> Date: Tue, 14 Feb 2017 17:57:48 +0900 Subject: [PATCH] Add Tizen RuntimeID case @@ -6,14 +6,14 @@ Subject: [PATCH] Add Tizen RuntimeID case Change-Id: I4d689e31f64143c3d0e2dac74b09aefc9d40de60 Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com> --- - build.sh | 7 +++++++ - 1 file changed, 7 insertions(+) + build.sh | 13 +++++++++++++ + 1 file changed, 13 insertions(+) diff --git a/build.sh b/build.sh -index 8d03121..94d943e 100755 +index 8d03121..f18a1e8 100755 --- a/build.sh +++ b/build.sh -@@ -338,11 +338,16 @@ isMSBuildOnNETCoreSupported() +@@ -338,11 +338,18 @@ isMSBuildOnNETCoreSupported() "alpine.3.4.3-x64") __isMSBuildOnNETCoreSupported=1 ;; @@ -27,10 +27,22 @@ index 8d03121..94d943e 100755 fi + elif [ "$__HostArch" == "arm" ]; then + __isMSBuildOnNETCoreSupported=1 ++ elif [ "$__HostArch" == "x86" ]; then ++ __isMSBuildOnNETCoreSupported=1 fi } -@@ -406,6 +411,8 @@ build_CoreLib() +@@ -400,12 +407,18 @@ build_CoreLib() + # The cross build generates a crossgen with the target architecture. + if [ $__CrossBuild != 1 ]; then + # The architecture of host pc must be same architecture with target. ++ if [[ ( "$__HostArch" == "x86") ]]; then ++ exit 0 ++ fi ++ + if [[ ( "$__HostArch" == "$__BuildArch" ) ]]; then + build_CoreLib_ni + elif [[ ( "$__HostArch" == "x64" ) && ( "$__BuildArch" == "x86" ) ]]; then build_CoreLib_ni elif [[ ( "$__HostArch" == "arm64" ) && ( "$__BuildArch" == "arm" ) ]]; then build_CoreLib_ni |