diff options
| author | Ulrich Weigand <ulrich.weigand@de.ibm.com> | 2021-08-30 16:23:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-30 16:23:36 +0300 |
| commit | 5df6cc63151d937724fa0ce8138e69f933052606 (patch) | |
| tree | 564b8ed528cfb26e03d2608b46bad5df1efee663 /eng/native | |
| parent | 3845c0447460af3b6d75f7dd3247ec39ecbcbc27 (diff) | |
Add s390x support in a few places in eng/native build scripts (#56426)
* Make isMSBuildOnNETCoreSupported return true on s390x
(fixes generating version headers)
* Add s390x platform-specific library name in find_unwind_libs
(enables linking against system-provided libunwind)
Diffstat (limited to 'eng/native')
| -rwxr-xr-x | eng/native/build-commons.sh | 4 | ||||
| -rw-r--r-- | eng/native/functions.cmake | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh index e07b5e0048c..9600e346b36 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" == "armel" || "$__HostArch" == "arm64" ) ]]; then + if [[ ( "$__HostOS" == "Linux" ) && ( "$__HostArch" == "x64" || "$__HostArch" == "arm" || "$__HostArch" == "armel" || "$__HostArch" == "arm64" || "$__HostArch" == "s390x" ) ]]; then __IsMSBuildOnNETCoreSupported=1 elif [[ ( "$__HostOS" == "OSX" || "$__HostOS" == "FreeBSD" ) && "$__HostArch" == "x64" ]]; then __IsMSBuildOnNETCoreSupported=1 @@ -230,7 +230,7 @@ usage() echo "" echo "Common Options:" echo "" - echo "BuildArch can be: -arm, -armel, -arm64, x64, x86, -wasm" + echo "BuildArch can be: -arm, -armel, -arm64, -s390x, x64, x86, -wasm" echo "BuildType can be: -debug, -checked, -release" echo "-os: target OS (defaults to running OS)" echo "-bindir: output directory (defaults to $__ProjectRoot/artifacts)" diff --git a/eng/native/functions.cmake b/eng/native/functions.cmake index 0d03cc3d2d4..66a91ca0af8 100644 --- a/eng/native/functions.cmake +++ b/eng/native/functions.cmake @@ -89,6 +89,10 @@ function(find_unwind_libs UnwindLibs) find_library(UNWIND_ARCH NAMES unwind-x86_64) endif() + if(CLR_CMAKE_HOST_ARCH_S390X) + find_library(UNWIND_ARCH NAMES unwind-s390x) + endif() + if(NOT UNWIND_ARCH STREQUAL UNWIND_ARCH-NOTFOUND) set(UNWIND_LIBS ${UNWIND_ARCH}) endif() |