diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f10251a1993..0d52e24b08a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -157,25 +157,25 @@ - + https://github.com/dotnet/arcade - a6513a141bc5cb0d7d625399918fcbca1dc8a412 + 576b0a6fca70266087aa247d68896376ecec8c6e - + https://github.com/dotnet/arcade - a6513a141bc5cb0d7d625399918fcbca1dc8a412 + 576b0a6fca70266087aa247d68896376ecec8c6e - + https://github.com/dotnet/arcade - a6513a141bc5cb0d7d625399918fcbca1dc8a412 + 576b0a6fca70266087aa247d68896376ecec8c6e - + https://github.com/dotnet/arcade - a6513a141bc5cb0d7d625399918fcbca1dc8a412 + 576b0a6fca70266087aa247d68896376ecec8c6e - + https://github.com/dotnet/arcade - a6513a141bc5cb0d7d625399918fcbca1dc8a412 + 576b0a6fca70266087aa247d68896376ecec8c6e https://github.com/dotnet/sourcelink diff --git a/eng/Versions.props b/eng/Versions.props index 65f7c5e96ba..acdec761d7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,8 +48,8 @@ - 9.0.0-beta.23559.3 - 9.0.0-beta.23559.3 + 9.0.0-beta.23560.1 + 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 9cd64aca229..cf530cac0e2 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23559.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23559.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23560.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23560.1" }, "sdk": { "version": "9.0.100-alpha.1.23511.2"