Skip to content

Commit 4ff4ce2

Browse files
[release/8.0] Pass --target for s390x in toolchain.cmake (#15555)
This is necessary to unbreak the s390x build after the move to the azurelinux-3.0 images: dotnet/runtime#112435 Co-authored-by: Adeel Mujahid <[email protected]>
1 parent 221fba2 commit 4ff4ce2

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

eng/common/cross/toolchain.cmake

+4
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
280280
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
281281
add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}")
282282
endif()
283+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
284+
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
283285
elseif(TARGET_ARCH_NAME STREQUAL "x86")
284286
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
285287
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
@@ -327,6 +329,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
327329
if(TARGET_ARCH_NAME STREQUAL "armel")
328330
add_compile_options(-mfloat-abi=softfp)
329331
endif()
332+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
333+
add_compile_options("--target=${TOOLCHAIN}")
330334
elseif(TARGET_ARCH_NAME STREQUAL "x86")
331335
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
332336
add_compile_options(--target=${TOOLCHAIN})

0 commit comments

Comments
 (0)