diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cd5272d72c..edd638881f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,17 +43,17 @@ - + https://github.com/dotnet/arcade - f2ad2b48b7426e77e19902068b3aa38476073ab1 + 576b0a6fca70266087aa247d68896376ecec8c6e - + https://github.com/dotnet/arcade - f2ad2b48b7426e77e19902068b3aa38476073ab1 + 576b0a6fca70266087aa247d68896376ecec8c6e - + https://github.com/dotnet/arcade - f2ad2b48b7426e77e19902068b3aa38476073ab1 + 576b0a6fca70266087aa247d68896376ecec8c6e diff --git a/eng/Versions.props b/eng/Versions.props index 2b8bef3a6c9..711d87207dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ 9.0.0-alpha.1.23559.1 - 9.0.0-beta.23558.3 + 9.0.0-beta.23560.1 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 00288a30065..3762640fdcf 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -288,6 +288,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") endif() +elseif(TARGET_ARCH_NAME STREQUAL "s390x") + add_toolchain_linker_flag("--target=${TOOLCHAIN}") elseif(TARGET_ARCH_NAME STREQUAL "x86") if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl) add_toolchain_linker_flag("--target=${TOOLCHAIN}") @@ -335,6 +337,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") if(TARGET_ARCH_NAME STREQUAL "armel") add_compile_options(-mfloat-abi=softfp) endif() +elseif(TARGET_ARCH_NAME STREQUAL "s390x") + add_compile_options("--target=${TOOLCHAIN}") elseif(TARGET_ARCH_NAME STREQUAL "x86") if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl) add_compile_options(--target=${TOOLCHAIN}) diff --git a/global.json b/global.json index d55cbfc0726..c2a3ed6d319 100644 --- a/global.json +++ b/global.json @@ -8,7 +8,7 @@ "dotnet": "8.0.100-rtm.23506.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23558.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23558.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23560.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23560.1" } }