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/functions.cmake | |
| 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/functions.cmake')
| -rw-r--r-- | eng/native/functions.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
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() |