File tree Expand file tree Collapse file tree 4 files changed +8
-4
lines changed
Expand file tree Collapse file tree 4 files changed +8
-4
lines changed Original file line number Diff line number Diff line change 33 <ProductDependencies >
44 </ProductDependencies >
55 <ToolsetDependencies >
6- <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 9.0.0-beta.23553 .1" >
6+ <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 9.0.0-beta.23560 .1" >
77 <Uri >https://github.com/dotnet/arcade</Uri >
8- <Sha >1f067970472e5eb1877797bc4304dd13f284c7ba </Sha >
8+ <Sha >576b0a6fca70266087aa247d68896376ecec8c6e </Sha >
99 </Dependency >
1010 </ToolsetDependencies >
1111</Dependencies >
Original file line number Diff line number Diff line change @@ -288,6 +288,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
288288 add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS} /usr/lib64" )
289289 add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS} /usr/lib64/gcc/${TIZEN_TOOLCHAIN} " )
290290 endif ()
291+ elseif (TARGET_ARCH_NAME STREQUAL "s390x" )
292+ add_toolchain_linker_flag("--target=${TOOLCHAIN} " )
291293elseif (TARGET_ARCH_NAME STREQUAL "x86" )
292294 if (EXISTS ${CROSS_ROOTFS} /usr/lib/gcc/i586-alpine-linux-musl)
293295 add_toolchain_linker_flag("--target=${TOOLCHAIN} " )
@@ -335,6 +337,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
335337 if (TARGET_ARCH_NAME STREQUAL "armel" )
336338 add_compile_options (-mfloat-abi=softfp)
337339 endif ()
340+ elseif (TARGET_ARCH_NAME STREQUAL "s390x" )
341+ add_compile_options ("--target=${TOOLCHAIN} " )
338342elseif (TARGET_ARCH_NAME STREQUAL "x86" )
339343 if (EXISTS ${CROSS_ROOTFS} /usr/lib/gcc/i586-alpine-linux-musl)
340344 add_compile_options (--target =${TOOLCHAIN} )
Original file line number Diff line number Diff line change @@ -310,7 +310,7 @@ function GetDotNetInstallScript {
310310 curl " $install_script_url " -sSL --retry 10 --create-dirs -o " $install_script " || {
311311 if command -v openssl & > /dev/null; then
312312 echo " Curl failed; dumping some information about dotnet.microsoft.com for later investigation"
313- echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443
313+ echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443 || true
314314 fi
315315 echo " Will now retry the same URL with verbose logging."
316316 with_retries curl " $install_script_url " -sSL --verbose --retry 10 --create-dirs -o " $install_script " || {
Original file line number Diff line number Diff line change 1616 }
1717 },
1818 "msbuild-sdks" : {
19- "Microsoft.DotNet.Arcade.Sdk" : " 9.0.0-beta.23553 .1"
19+ "Microsoft.DotNet.Arcade.Sdk" : " 9.0.0-beta.23560 .1"
2020 }
2121}
You can’t perform that action at this time.
0 commit comments