From a4bc93f0a0abc0e9aff7c0514e43ad72a6db0273 Mon Sep 17 00:00:00 2001 From: Kirill Frolov Date: Tue, 11 Feb 2020 02:08:26 +0300 Subject: [PATCH] Fixed armel/tizen support in build-commons.h (#32043) This commit adds possibility to build .NET runtime in Tizen's build environment (32-bit arm, little endian, soft fp). Two issues was fixed: 1) wrong host os detection (tizen's build system is "armel", but not "arm"); 2) build is allowed not only on "arm", "arm64" and "x64" hosts, but on "armel" host too. Fixes #32042 --- eng/native/build-commons.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh index ed3362c..8707e3b 100755 --- a/eng/native/build-commons.sh +++ b/eng/native/build-commons.sh @@ -27,7 +27,7 @@ isMSBuildOnNETCoreSupported() return fi - if [[ ( "$__HostOS" == "Linux" ) && ( "$__HostArch" == "x64" || "$__HostArch" == "arm" || "$__HostArch" == "arm64" ) ]]; then + if [[ ( "$__HostOS" == "Linux" ) && ( "$__HostArch" == "x64" || "$__HostArch" == "arm" || "$__HostArch" == "armel" || "$__HostArch" == "arm64" ) ]]; then __IsMSBuildOnNETCoreSupported=1 elif [[ ( "$__HostOS" == "OSX" || "$__HostOS" == "FreeBSD" ) && "$__HostArch" == "x64" ]]; then __IsMSBuildOnNETCoreSupported=1 @@ -213,8 +213,13 @@ case "$CPUName" in ;; armv7l) - __BuildArch=arm - __HostArch=arm + if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then + __BuildArch=armel + __HostArch=armel + else + __BuildArch=arm + __HostArch=arm + fi ;; i686) -- 2.7.4