From b522c16ae3e5e40496697672f1e0267e350e823c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 14 Apr 2023 15:35:28 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20230413.1 (#1571)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/common/cross/toolchain.cmake | 6 ++++--
global.json | 2 +-
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 56607e09..b67e54b9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
-
+
https://github.com/dotnet/arcade
- 17d9eee32f20a6af0ebb620254a22f601d159578
+ fb14cae30eacbe844468ac297b3d4c61e0bb9dc0
-
+
https://github.com/dotnet/arcade
- 17d9eee32f20a6af0ebb620254a22f601d159578
+ fb14cae30eacbe844468ac297b3d4c61e0bb9dc0
-
+
https://github.com/dotnet/arcade
- 17d9eee32f20a6af0ebb620254a22f601d159578
+ fb14cae30eacbe844468ac297b3d4c61e0bb9dc0
-
+
https://github.com/dotnet/arcade
- 17d9eee32f20a6af0ebb620254a22f601d159578
+ fb14cae30eacbe844468ac297b3d4c61e0bb9dc0
-
+
https://github.com/dotnet/arcade
- 17d9eee32f20a6af0ebb620254a22f601d159578
+ fb14cae30eacbe844468ac297b3d4c61e0bb9dc0
https://github.com/dotnet/arcade-services
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index d813dde6..1c9d212d 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -76,7 +76,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x")
set(TOOLCHAIN "s390x-linux-gnu")
elseif(TARGET_ARCH_NAME STREQUAL "x64")
set(CMAKE_SYSTEM_PROCESSOR x86_64)
- if(LINUX)
+ if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/x86_64-alpine-linux-musl)
+ set(TOOLCHAIN "x86_64-alpine-linux-musl")
+ elseif(LINUX)
set(TOOLCHAIN "x86_64-linux-gnu")
if(TIZEN)
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
@@ -279,7 +281,7 @@ endif()
# Specify compile options
-if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
+if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
diff --git a/global.json b/global.json
index 78598ed6..b6a64506 100644
--- a/global.json
+++ b/global.json
@@ -14,6 +14,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23211.8"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23213.1"
}
}