Skip to content

Commit ad0d7d2

Browse files
dotnet-maestro[bot]HaoK
authored andcommitted
Update dependencies from https://github.com/dotnet/arcade build 20200724.1 (#24482)
Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20364.3 -> To Version 5.0.0-beta.20374.1 - downgrade of the Arcade SDK should be fine Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 02ba8fd commit ad0d7d2

File tree

3 files changed

+32
-21
lines changed

3 files changed

+32
-21
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,13 +305,13 @@
305305
<Uri>https://github.com/dotnet/runtime</Uri>
306306
<Sha>0e0e648770e54b12c2fa81a77538ce1a72fca8af</Sha>
307307
</Dependency>
308-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20377.2">
308+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20374.1">
309309
<Uri>https://github.com/dotnet/arcade</Uri>
310-
<Sha>22d6355c4f3c9ac00b0e3abf9d85f2fb07e4787b</Sha>
310+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
311311
</Dependency>
312-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20364.3">
312+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20374.1">
313313
<Uri>https://github.com/dotnet/arcade</Uri>
314-
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
314+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
315315
</Dependency>
316316
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-2.20379.3">
317317
<Uri>https://github.com/dotnet/roslyn</Uri>

eng/common/cross/toolchain.cmake

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -127,29 +127,40 @@ endif()
127127

128128
# Specify link flags
129129

130+
function(add_toolchain_linker_flag Flag)
131+
set(Config "${ARGV1}")
132+
set(CONFIG_SUFFIX "")
133+
if (NOT Config STREQUAL "")
134+
set(CONFIG_SUFFIX "_${Config}")
135+
endif()
136+
set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
137+
set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
138+
endfunction()
139+
140+
130141
if(TARGET_ARCH_NAME STREQUAL "armel")
131142
if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
132-
add_link_options("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
133-
add_link_options("-L${CROSS_ROOTFS}/lib")
134-
add_link_options("-L${CROSS_ROOTFS}/usr/lib")
135-
add_link_options("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
143+
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
144+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
145+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
146+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
136147
endif()
137148
elseif(TARGET_ARCH_NAME STREQUAL "arm64")
138149
if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
139-
add_link_options("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
140-
add_link_options("-L${CROSS_ROOTFS}/lib64")
141-
add_link_options("-L${CROSS_ROOTFS}/usr/lib64")
142-
add_link_options("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
143-
144-
add_link_options("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64")
145-
add_link_options("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
146-
add_link_options("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
150+
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
151+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
152+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64")
153+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
154+
155+
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64")
156+
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
157+
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
147158
endif()
148159
elseif(TARGET_ARCH_NAME STREQUAL "x86")
149-
add_link_options(-m32)
160+
add_toolchain_linker_flag(-m32)
150161
elseif(ILLUMOS)
151-
add_link_options("-L${CROSS_ROOTFS}/lib/amd64")
152-
add_link_options("-L${CROSS_ROOTFS}/usr/amd64/lib")
162+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")
163+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/amd64/lib")
153164
endif()
154165

155166
# Specify compile options

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"msbuild-sdks": {
3232
"Yarn.MSBuild": "1.15.2",
33-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20377.2",
34-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3"
33+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20374.1",
34+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20374.1"
3535
}
3636
}

0 commit comments

Comments
 (0)