Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ This file should be imported by eng/Versions.props
<runtimewinarm64MicrosoftNETCoreRuntimeWasmPythonTransportPackageVersion>12.0.0-alpha.1.26552.1</runtimewinarm64MicrosoftNETCoreRuntimeWasmPythonTransportPackageVersion>
<runtimewinx64MicrosoftNETCoreRuntimeWasmPythonTransportPackageVersion>12.0.0-alpha.1.26552.1</runtimewinx64MicrosoftNETCoreRuntimeWasmPythonTransportPackageVersion>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>12.0.0-beta.26555.106</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFileCatalogPackageVersion>12.0.0-beta.26555.106</MicrosoftDotNetBuildTasksFileCatalogPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>12.0.0-beta.26555.106</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>12.0.0-beta.26555.106</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>12.0.0-beta.26555.106</MicrosoftDotNetXliffTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>12.0.0-beta.26556.115</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFileCatalogPackageVersion>12.0.0-beta.26556.115</MicrosoftDotNetBuildTasksFileCatalogPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>12.0.0-beta.26556.115</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>12.0.0-beta.26556.115</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>12.0.0-beta.26556.115</MicrosoftDotNetXliffTasksPackageVersion>
<!-- dotnet-emscripten dependencies -->
<MicrosoftNETCoreRuntimeWasmEmscriptenTransportPackageVersion>12.0.0-alpha.1.26552.1</MicrosoftNETCoreRuntimeWasmEmscriptenTransportPackageVersion>
<!-- dotnet-llvm-project dependencies -->
Expand Down Expand Up @@ -66,14 +66,14 @@ This file should be imported by eng/Versions.props
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion>23.1.0-alpha.1.26526.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion>
<runtimewinx64MicrosoftNETCoreRuntimeWasmLLVMTransportPackageVersion>23.1.0-alpha.1.26526.1</runtimewinx64MicrosoftNETCoreRuntimeWasmLLVMTransportPackageVersion>
<!-- dotnet-node dependencies -->
<runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>12.0.0-alpha.1.26526.3</runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>12.0.0-alpha.1.26526.3</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>12.0.0-alpha.1.26526.3</runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>12.0.0-alpha.1.26526.3</runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>12.0.0-alpha.1.26526.3</runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>12.0.0-alpha.1.26526.3</runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>12.0.0-alpha.1.26526.3</runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>12.0.0-alpha.1.26526.3</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>12.0.0-alpha.1.26554.1</runtimelinuxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>12.0.0-alpha.1.26554.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>12.0.0-alpha.1.26554.1</runtimelinuxmuslx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>12.0.0-alpha.1.26554.1</runtimelinuxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>12.0.0-alpha.1.26554.1</runtimeosxarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>12.0.0-alpha.1.26554.1</runtimeosxx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>12.0.0-alpha.1.26554.1</runtimewinarm64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>12.0.0-alpha.1.26554.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
54 changes: 27 additions & 27 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="emsdk" Sha="7cc16ae385c54fe87ffc1b3d1ae040b899e8c9c9" BarId="340125" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="emsdk" Sha="6e6f978fd9ca19b62796a13ff5230b21af0c42fa" BarId="340367" />
<ProductDependencies>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport" Version="12.0.0-alpha.1.26552.1">
<Uri>https://github.com/dotnet/binaryen</Uri>
Expand Down Expand Up @@ -50,37 +50,37 @@
<Uri>https://github.com/dotnet/cpython</Uri>
<Sha>ee8db2ea10bbc5e0ef933e5d207c2616c0f5e8ef</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="12.0.0-alpha.1.26526.3">
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="12.0.0-alpha.1.26554.1">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>7770f39b50ffe2e746e25d5c411ccf82825cad76</Sha>
<Sha>6e08d97356532ad22e000bcd5b3cac620742e0df</Sha>
</Dependency>
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="12.0.0-alpha.1.26526.3">
<Dependency Name="runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="12.0.0-alpha.1.26554.1">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>7770f39b50ffe2e746e25d5c411ccf82825cad76</Sha>
<Sha>6e08d97356532ad22e000bcd5b3cac620742e0df</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="12.0.0-alpha.1.26526.3">
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="12.0.0-alpha.1.26554.1">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>7770f39b50ffe2e746e25d5c411ccf82825cad76</Sha>
<Sha>6e08d97356532ad22e000bcd5b3cac620742e0df</Sha>
</Dependency>
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="12.0.0-alpha.1.26526.3">
<Dependency Name="runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="12.0.0-alpha.1.26554.1">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>7770f39b50ffe2e746e25d5c411ccf82825cad76</Sha>
<Sha>6e08d97356532ad22e000bcd5b3cac620742e0df</Sha>
</Dependency>
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="12.0.0-alpha.1.26526.3">
<Dependency Name="runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="12.0.0-alpha.1.26554.1">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>7770f39b50ffe2e746e25d5c411ccf82825cad76</Sha>
<Sha>6e08d97356532ad22e000bcd5b3cac620742e0df</Sha>
</Dependency>
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="12.0.0-alpha.1.26526.3">
<Dependency Name="runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="12.0.0-alpha.1.26554.1">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>7770f39b50ffe2e746e25d5c411ccf82825cad76</Sha>
<Sha>6e08d97356532ad22e000bcd5b3cac620742e0df</Sha>
</Dependency>
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="12.0.0-alpha.1.26526.3">
<Dependency Name="runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="12.0.0-alpha.1.26554.1">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>7770f39b50ffe2e746e25d5c411ccf82825cad76</Sha>
<Sha>6e08d97356532ad22e000bcd5b3cac620742e0df</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="12.0.0-alpha.1.26526.3">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport" Version="12.0.0-alpha.1.26554.1">
<Uri>https://github.com/dotnet/node</Uri>
<Sha>7770f39b50ffe2e746e25d5c411ccf82825cad76</Sha>
<Sha>6e08d97356532ad22e000bcd5b3cac620742e0df</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.LLVM.Transport" Version="23.1.0-alpha.1.26526.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
Expand Down Expand Up @@ -236,25 +236,25 @@
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>39bfdf96aa8c5d7717c7231ac4f1d7aa336fe921</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="12.0.0-beta.26555.106">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="12.0.0-beta.26556.115">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cc16ae385c54fe87ffc1b3d1ae040b899e8c9c9</Sha>
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="12.0.0-beta.26555.106">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="12.0.0-beta.26556.115">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cc16ae385c54fe87ffc1b3d1ae040b899e8c9c9</Sha>
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="12.0.0-beta.26555.106">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="12.0.0-beta.26556.115">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cc16ae385c54fe87ffc1b3d1ae040b899e8c9c9</Sha>
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="12.0.0-beta.26555.106">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="12.0.0-beta.26556.115">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cc16ae385c54fe87ffc1b3d1ae040b899e8c9c9</Sha>
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.FileCatalog" Version="12.0.0-beta.26555.106">
<Dependency Name="Microsoft.DotNet.Build.Tasks.FileCatalog" Version="12.0.0-beta.26556.115">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>7cc16ae385c54fe87ffc1b3d1ae040b899e8c9c9</Sha>
<Sha>6e6f978fd9ca19b62796a13ff5230b21af0c42fa</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
11 changes: 1 addition & 10 deletions eng/common/cross/build-rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
usage()
{
echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir <directory>]"
echo "BuildArch can be: arm(default), arm64, loongarch64, ppc64le, riscv64, s390x, x64, x86"
echo "BuildArch can be: arm(default), arm64, loongarch64, ppc64le, riscv64, s390x, x64"
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
echo " for alpine can be specified with version: alpineX.YY or alpineedge"
echo " for FreeBSD can be: freebsd14, freebsd15"
Expand Down Expand Up @@ -230,12 +230,6 @@ while :; do
__HaikuArch=x86_64
__UbuntuRepo="https://archive.ubuntu.com/ubuntu/"
;;
x86)
__BuildArch=x86
__UbuntuArch=i386
__AlpineArch=x86
__UbuntuRepo="https://archive.ubuntu.com/ubuntu/"
;;
lldb*)
version="$(echo "$lowerI" | tr -d '[:alpha:]-=')"
majorVersion="${version%%.*}"
Expand Down Expand Up @@ -460,9 +454,6 @@ case "$__AlpineVersion" in
if [[ "$__AlpineArch" =~ s390x|ppc64le ]]; then
__AlpineVersion=3.15 # minimum version that supports lldb-dev
__AlpinePackages+=" llvm12-libs"
elif [[ "$__AlpineArch" == "x86" ]]; then
__AlpineVersion=3.17 # minimum version that supports lldb-dev
__AlpinePackages+=" llvm15-libs"
elif [[ "$__AlpineArch" == "loongarch64" ]]; then
__AlpineVersion=3.21 # minimum version that supports lldb-dev
__AlpinePackages+=" llvm19-libs"
Expand Down
3 changes: 0 additions & 3 deletions eng/common/cross/tizen-build-rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ case "$ARCH" in
arm64)
TIZEN_ARCH="aarch64"
;;
x86)
TIZEN_ARCH="i686"
;;
x64)
TIZEN_ARCH="x86_64"
LINK_ARCH="x86"
Expand Down
58 changes: 8 additions & 50 deletions eng/common/cross/toolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -130,18 +130,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
elseif(HAIKU)
set(TOOLCHAIN "x86_64-unknown-haiku")
endif()
elseif(TARGET_ARCH_NAME STREQUAL "x86")
set(CMAKE_SYSTEM_PROCESSOR i686)
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
set(TOOLCHAIN "i586-alpine-linux-musl")
else()
set(TOOLCHAIN "i686-linux-gnu")
endif()
if(TIZEN)
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu")
endif()
else()
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x, x64 and x86 are supported!")
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x and x64 are supported!")
endif()

if(DEFINED ENV{TOOLCHAIN})
Expand All @@ -159,7 +149,7 @@ if(TIZEN)
set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE)
endfunction()

if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
else()
find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
Expand Down Expand Up @@ -300,18 +290,6 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
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}")
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}")
endif()
add_toolchain_linker_flag(-m32)
if(TIZEN)
add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}")
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}")
endif()
elseif(ILLUMOS)
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/amd64/lib")
Expand All @@ -322,7 +300,7 @@ endif()

# Specify compile options

if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT OPENHARMONY AND NOT FREEBSD AND NOT OPENBSD) OR ILLUMOS OR HAIKU)
if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64)$" AND NOT ANDROID AND NOT OPENHARMONY AND NOT FREEBSD AND NOT OPENBSD) OR ILLUMOS OR HAIKU)
set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN})
set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN})
Expand All @@ -349,46 +327,26 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
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})
endif()
add_compile_options(-m32)
add_compile_options(-Wno-error=unused-command-line-argument)
endif()

if(TIZEN)
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|x86)$")
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$")
add_compile_options(-Wno-deprecated-declarations) # compile-time option
add_compile_options(-D__extern_always_inline=inline) # compile-time option
endif()
endif()

# Set LLDB include and library paths for builds that need lldb.
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
if(TARGET_ARCH_NAME STREQUAL "x86")
set(LLVM_CROSS_DIR "$ENV{LLVM_CROSS_HOME}")
else() # arm/armel case
set(LLVM_CROSS_DIR "$ENV{LLVM_ARM_HOME}")
endif()
if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
set(LLVM_CROSS_DIR "$ENV{LLVM_ARM_HOME}")
if(LLVM_CROSS_DIR)
set(WITH_LLDB_LIBS "${LLVM_CROSS_DIR}/lib/" CACHE STRING "")
set(WITH_LLDB_INCLUDES "${LLVM_CROSS_DIR}/include" CACHE STRING "")
set(LLDB_H "${WITH_LLDB_INCLUDES}" CACHE STRING "")
set(LLDB "${LLVM_CROSS_DIR}/lib/liblldb.so" CACHE STRING "")
else()
if(TARGET_ARCH_NAME STREQUAL "x86")
set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/i386-linux-gnu" CACHE STRING "")
set(CHECK_LLVM_DIR "${CROSS_ROOTFS}/usr/lib/llvm-3.8/include")
if(EXISTS "${CHECK_LLVM_DIR}" AND IS_DIRECTORY "${CHECK_LLVM_DIR}")
set(WITH_LLDB_INCLUDES "${CHECK_LLVM_DIR}")
else()
set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include")
endif()
else() # arm/armel case
set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}" CACHE STRING "")
set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include" CACHE STRING "")
endif()
set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}" CACHE STRING "")
set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include" CACHE STRING "")
endif()
endif()

Expand Down
9 changes: 0 additions & 9 deletions eng/common/cross/x86/tizen/tizen.patch

This file was deleted.

8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "12.0.100-alpha.1.26531.102",
"version": "12.0.100-alpha.1.26555.106",
"allowPrerelease": true,
"rollForward": "major",
"paths": [
Expand All @@ -10,11 +10,11 @@
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
},
"tools": {
"dotnet": "12.0.100-alpha.1.26531.102"
"dotnet": "12.0.100-alpha.1.26555.106"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26555.106",
"Microsoft.DotNet.Helix.Sdk": "12.0.0-beta.26555.106",
"Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26556.115",
"Microsoft.DotNet.Helix.Sdk": "12.0.0-beta.26556.115",
"Microsoft.Build.Traversal": "3.4.0"
}
}