mirror of
https://github.com/rust-lang/rust
synced 2024-09-05 16:57:03 +00:00
Work around CI issue with windows sdk 10.0.20348.0.
This commit is contained in:
parent
497ee321af
commit
4ab3c117d0
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
|
@ -404,6 +404,7 @@ jobs:
|
|||
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=aarch64-pc-windows-msvc --enable-full-tools --enable-profiler"
|
||||
SCRIPT: python x.py dist
|
||||
DIST_REQUIRE_ALL_TOOLS: 0
|
||||
WINDOWS_SDK_20348_HACK: 1
|
||||
os: windows-latest-xl
|
||||
- name: dist-i686-mingw
|
||||
env:
|
||||
|
|
|
@ -635,6 +635,9 @@ jobs:
|
|||
SCRIPT: python x.py dist
|
||||
# RLS does not build for aarch64-pc-windows-msvc. See rust-lang/rls#1693
|
||||
DIST_REQUIRE_ALL_TOOLS: 0
|
||||
# Hack around this SDK version, because it doesn't work with clang.
|
||||
# See https://github.com/rust-lang/rust/issues/88796
|
||||
WINDOWS_SDK_20348_HACK: 1
|
||||
<<: *job-windows-xl
|
||||
|
||||
- name: dist-i686-mingw
|
||||
|
|
|
@ -37,6 +37,12 @@ if isMacOS; then
|
|||
# `clang-ar` by accident.
|
||||
ciCommandSetEnv AR "ar"
|
||||
elif isWindows && [[ ${CUSTOM_MINGW-0} -ne 1 ]]; then
|
||||
|
||||
if [[ ${WINDOWS_SDK_20348_HACK-0} -eq 1 ]]; then
|
||||
rm -rf '/c/Program Files (x86)/Windows Kits/10/include/10.0.20348.0'
|
||||
mv '/c/Program Files (x86)/Windows Kits/10/include/'10.0.{19041,20348}.0
|
||||
fi
|
||||
|
||||
# If we're compiling for MSVC then we, like most other distribution builders,
|
||||
# switch to clang as the compiler. This'll allow us eventually to enable LTO
|
||||
# amongst LLVM and rustc. Note that we only do this on MSVC as I don't think
|
||||
|
|
Loading…
Reference in a new issue