Skip to content

Commit 4921e8d

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20241212.1 (#59455)
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk From Version 10.0.0-beta.24606.6 -> To Version 10.0.0-beta.24612.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 9ab6570 commit 4921e8d

File tree

5 files changed

+91
-120
lines changed

5 files changed

+91
-120
lines changed

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -384,39 +384,39 @@
384384
<Uri>https://github.com/dotnet/runtime</Uri>
385385
<Sha>c6464250c27ee67af31d6df3141db1722f006e48</Sha>
386386
</Dependency>
387-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24606.6">
387+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24612.1">
388388
<Uri>https://github.com/dotnet/arcade</Uri>
389-
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
389+
<Sha>2c4eeabbeab30dfe532190f7e5c448078231cdd0</Sha>
390390
</Dependency>
391391
<!-- Intermediate is necessary for source build. -->
392-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24606.6">
392+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24612.1">
393393
<Uri>https://github.com/dotnet/arcade</Uri>
394-
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
394+
<Sha>2c4eeabbeab30dfe532190f7e5c448078231cdd0</Sha>
395395
<SourceBuild RepoName="arcade" ManagedOnly="true" />
396396
</Dependency>
397-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24606.6">
397+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24612.1">
398398
<Uri>https://github.com/dotnet/arcade</Uri>
399-
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
399+
<Sha>2c4eeabbeab30dfe532190f7e5c448078231cdd0</Sha>
400400
</Dependency>
401-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24606.6">
401+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24612.1">
402402
<Uri>https://github.com/dotnet/arcade</Uri>
403-
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
403+
<Sha>2c4eeabbeab30dfe532190f7e5c448078231cdd0</Sha>
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24606.6">
405+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24612.1">
406406
<Uri>https://github.com/dotnet/arcade</Uri>
407-
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
407+
<Sha>2c4eeabbeab30dfe532190f7e5c448078231cdd0</Sha>
408408
</Dependency>
409-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24606.6">
409+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24612.1">
410410
<Uri>https://github.com/dotnet/arcade</Uri>
411-
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
411+
<Sha>2c4eeabbeab30dfe532190f7e5c448078231cdd0</Sha>
412412
</Dependency>
413-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24606.6">
413+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24612.1">
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415-
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
415+
<Sha>2c4eeabbeab30dfe532190f7e5c448078231cdd0</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24606.6">
417+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24612.1">
418418
<Uri>https://github.com/dotnet/arcade</Uri>
419-
<Sha>61b8f746424762d2e3173ebfaab19346224d591c</Sha>
419+
<Sha>2c4eeabbeab30dfe532190f7e5c448078231cdd0</Sha>
420420
</Dependency>
421421
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0-preview.1.24609.1">
422422
<Uri>https://github.com/dotnet/extensions</Uri>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@
165165
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
166166
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
167167
<!-- Packages from dotnet/arcade -->
168-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24606.6</MicrosoftDotNetBuildTasksArchivesVersion>
169-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24606.6</MicrosoftDotNetBuildTasksInstallersVersion>
170-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24606.6</MicrosoftDotNetBuildTasksTemplatingVersion>
171-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24606.6</MicrosoftDotNetRemoteExecutorVersion>
172-
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24606.6</MicrosoftSourceBuildIntermediatearcadeVersion>
168+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24612.1</MicrosoftDotNetBuildTasksArchivesVersion>
169+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24612.1</MicrosoftDotNetBuildTasksInstallersVersion>
170+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24612.1</MicrosoftDotNetBuildTasksTemplatingVersion>
171+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24612.1</MicrosoftDotNetRemoteExecutorVersion>
172+
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24612.1</MicrosoftSourceBuildIntermediatearcadeVersion>
173173
<!-- Packages from dotnet/source-build-externals -->
174174
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.560301</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
175175
<!-- Packages from dotnet/source-build-reference-packages -->

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,12 @@ __UbuntuPackages+=" symlinks"
5252
__UbuntuPackages+=" libicu-dev"
5353
__UbuntuPackages+=" liblttng-ust-dev"
5454
__UbuntuPackages+=" libunwind8-dev"
55-
__UbuntuPackages+=" libnuma-dev"
5655

5756
__AlpinePackages+=" gettext-dev"
5857
__AlpinePackages+=" icu-dev"
5958
__AlpinePackages+=" libunwind-dev"
6059
__AlpinePackages+=" lttng-ust-dev"
6160
__AlpinePackages+=" compiler-rt"
62-
__AlpinePackages+=" numactl-dev"
6361

6462
# runtime libraries' dependencies
6563
__UbuntuPackages+=" libcurl4-openssl-dev"
@@ -424,13 +422,12 @@ case "$__AlpineVersion" in
424422
elif [[ "$__AlpineArch" == "riscv64" ]]; then
425423
__AlpineLlvmLibsLookup=1
426424
__AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive)
425+
elif [[ -n "$__AlpineVersion" ]]; then
426+
# use whichever alpine version is provided and select the latest toolchain libs
427+
__AlpineLlvmLibsLookup=1
427428
else
428429
__AlpineVersion=3.13 # 3.13 to maximize compatibility
429430
__AlpinePackages+=" llvm10-libs"
430-
431-
if [[ "$__AlpineArch" == "armv7" ]]; then
432-
__AlpinePackages="${__AlpinePackages//numactl-dev/}"
433-
fi
434431
fi
435432
esac
436433

@@ -444,11 +441,6 @@ if [[ "$__BuildArch" == "armel" ]]; then
444441
__LLDB_Package="lldb-3.5-dev"
445442
fi
446443

447-
if [[ "$__CodeName" == "xenial" && "$__UbuntuArch" == "armhf" ]]; then
448-
# libnuma-dev is not available on armhf for xenial
449-
__UbuntuPackages="${__UbuntuPackages//libnuma-dev/}"
450-
fi
451-
452444
__UbuntuPackages+=" ${__LLDB_Package:-}"
453445

454446
if [[ -z "$__UbuntuRepo" ]]; then

‎eng/common/cross/toolchain.cmake‎

Lines changed: 64 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm")
4040
set(TOOLCHAIN "arm-linux-gnueabihf")
4141
endif()
4242
if(TIZEN)
43-
set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
43+
set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf")
4444
endif()
4545
elseif(TARGET_ARCH_NAME STREQUAL "arm64")
4646
set(CMAKE_SYSTEM_PROCESSOR aarch64)
@@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
4949
elseif(LINUX)
5050
set(TOOLCHAIN "aarch64-linux-gnu")
5151
if(TIZEN)
52-
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
52+
set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu")
5353
endif()
5454
elseif(FREEBSD)
5555
set(triple "aarch64-unknown-freebsd12")
@@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel")
5858
set(CMAKE_SYSTEM_PROCESSOR armv7l)
5959
set(TOOLCHAIN "arm-linux-gnueabi")
6060
if(TIZEN)
61-
set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
61+
set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi")
6262
endif()
6363
elseif(TARGET_ARCH_NAME STREQUAL "armv6")
6464
set(CMAKE_SYSTEM_PROCESSOR armv6l)
@@ -67,6 +67,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "armv6")
6767
else()
6868
set(TOOLCHAIN "arm-linux-gnueabihf")
6969
endif()
70+
elseif(TARGET_ARCH_NAME STREQUAL "loongarch64")
71+
set(CMAKE_SYSTEM_PROCESSOR "loongarch64")
72+
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/loongarch64-alpine-linux-musl)
73+
set(TOOLCHAIN "loongarch64-alpine-linux-musl")
74+
else()
75+
set(TOOLCHAIN "loongarch64-linux-gnu")
76+
endif()
7077
elseif(TARGET_ARCH_NAME STREQUAL "ppc64le")
7178
set(CMAKE_SYSTEM_PROCESSOR ppc64le)
7279
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/powerpc64le-alpine-linux-musl)
@@ -81,7 +88,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64")
8188
else()
8289
set(TOOLCHAIN "riscv64-linux-gnu")
8390
if(TIZEN)
84-
set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0")
91+
set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu")
8592
endif()
8693
endif()
8794
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
@@ -98,7 +105,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
98105
elseif(LINUX)
99106
set(TOOLCHAIN "x86_64-linux-gnu")
100107
if(TIZEN)
101-
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
108+
set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu")
102109
endif()
103110
elseif(FREEBSD)
104111
set(triple "x86_64-unknown-freebsd12")
@@ -115,10 +122,10 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
115122
set(TOOLCHAIN "i686-linux-gnu")
116123
endif()
117124
if(TIZEN)
118-
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
125+
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu")
119126
endif()
120127
else()
121-
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!")
128+
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x, x64 and x86 are supported!")
122129
endif()
123130

124131
if(DEFINED ENV{TOOLCHAIN})
@@ -127,32 +134,46 @@ endif()
127134

128135
# Specify include paths
129136
if(TIZEN)
130-
if(TARGET_ARCH_NAME STREQUAL "arm")
131-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
132-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf)
133-
endif()
134-
if(TARGET_ARCH_NAME STREQUAL "armel")
135-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
136-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi)
137-
endif()
138-
if(TARGET_ARCH_NAME STREQUAL "arm64")
139-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
140-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu)
141-
endif()
142-
if(TARGET_ARCH_NAME STREQUAL "x86")
143-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
144-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu)
145-
endif()
146-
if(TARGET_ARCH_NAME STREQUAL "x64")
147-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
148-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu)
149-
endif()
150-
if(TARGET_ARCH_NAME STREQUAL "riscv64")
151-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
152-
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu)
137+
function(find_toolchain_dir prefix)
138+
# Dynamically find the version subdirectory
139+
file(GLOB DIRECTORIES "${prefix}/*")
140+
list(GET DIRECTORIES 0 FIRST_MATCH)
141+
get_filename_component(TOOLCHAIN_VERSION ${FIRST_MATCH} NAME)
142+
143+
set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE)
144+
endfunction()
145+
146+
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
147+
find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
148+
else()
149+
find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
153150
endif()
151+
152+
message(STATUS "TIZEN_TOOLCHAIN_PATH set to: ${TIZEN_TOOLCHAIN_PATH}")
153+
154+
include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++)
155+
include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN})
154156
endif()
155157

158+
function(locate_toolchain_exec exec var)
159+
set(TOOLSET_PREFIX ${TOOLCHAIN}-)
160+
string(TOUPPER ${exec} EXEC_UPPERCASE)
161+
if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "")
162+
set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE)
163+
return()
164+
endif()
165+
166+
find_program(EXEC_LOCATION_${exec}
167+
NAMES
168+
"${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
169+
"${TOOLSET_PREFIX}${exec}")
170+
171+
if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND")
172+
message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.")
173+
endif()
174+
set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE)
175+
endfunction()
176+
156177
if(ANDROID)
157178
if(TARGET_ARCH_NAME STREQUAL "arm")
158179
set(ANDROID_ABI armeabi-v7a)
@@ -183,66 +204,24 @@ elseif(FREEBSD)
183204
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld")
184205
elseif(ILLUMOS)
185206
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
207+
set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
208+
set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
209+
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
186210

187211
include_directories(SYSTEM ${CROSS_ROOTFS}/include)
188212

189-
set(TOOLSET_PREFIX ${TOOLCHAIN}-)
190-
function(locate_toolchain_exec exec var)
191-
string(TOUPPER ${exec} EXEC_UPPERCASE)
192-
if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "")
193-
set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE)
194-
return()
195-
endif()
196-
197-
find_program(EXEC_LOCATION_${exec}
198-
NAMES
199-
"${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
200-
"${TOOLSET_PREFIX}${exec}")
201-
202-
if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND")
203-
message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.")
204-
endif()
205-
set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE)
206-
endfunction()
207-
208-
set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
209-
210213
locate_toolchain_exec(gcc CMAKE_C_COMPILER)
211214
locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
212-
213-
set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
214-
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
215215
elseif(HAIKU)
216216
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
217217
set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
218-
219-
set(TOOLSET_PREFIX ${TOOLCHAIN}-)
220-
function(locate_toolchain_exec exec var)
221-
string(TOUPPER ${exec} EXEC_UPPERCASE)
222-
if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "")
223-
set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE)
224-
return()
225-
endif()
226-
227-
find_program(EXEC_LOCATION_${exec}
228-
NAMES
229-
"${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}"
230-
"${TOOLSET_PREFIX}${exec}")
231-
232-
if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND")
233-
message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.")
234-
endif()
235-
set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE)
236-
endfunction()
237-
238218
set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
219+
set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
220+
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
239221

240222
locate_toolchain_exec(gcc CMAKE_C_COMPILER)
241223
locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
242224

243-
set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
244-
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")
245-
246225
# let CMake set up the correct search paths
247226
include(Platform/Haiku)
248227
else()
@@ -272,21 +251,21 @@ endif()
272251

273252
if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
274253
if(TIZEN)
275-
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
254+
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
276255
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
277256
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
278-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
257+
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
279258
endif()
280259
elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
281260
if(TIZEN)
282-
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
261+
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
283262
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
284263
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64")
285-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
264+
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
286265

287266
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64")
288267
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
289-
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
268+
add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}")
290269
endif()
291270
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
292271
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
@@ -297,10 +276,10 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
297276
endif()
298277
add_toolchain_linker_flag(-m32)
299278
if(TIZEN)
300-
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
279+
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
301280
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
302281
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
303-
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
282+
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
304283
endif()
305284
elseif(ILLUMOS)
306285
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")
@@ -312,7 +291,7 @@ endif()
312291

313292
# Specify compile options
314293

315-
if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
294+
if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU)
316295
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
317296
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
318297
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "11.0.24"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24606.6",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24606.6",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24606.6",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24612.1",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24612.1",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24612.1",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

0 commit comments

Comments
 (0)