Skip to content

Commit e947bd7

Browse files
committed
remove hack, now CI uses (currently latest) SDK 10.0.22621.0
See https://github.com/rust-lang-ci/rust/actions/runs/5596259246/jobs/10233070602#step:24:929 C:\Program Files (x86)\Windows Kits\10\include\10.0.22621.0\ucrt\corecrt_io.h
1 parent 77e24f9 commit e947bd7

File tree

3 files changed

+0
-9
lines changed

3 files changed

+0
-9
lines changed

.github/workflows/ci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,6 @@ jobs:
422422
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --host=aarch64-pc-windows-msvc --enable-full-tools --enable-profiler"
423423
SCRIPT: python x.py dist bootstrap --include-default-paths
424424
DIST_REQUIRE_ALL_TOOLS: 1
425-
WINDOWS_SDK_20348_HACK: 1
426425
os: windows-2019-8core-32gb
427426
- name: dist-i686-mingw
428427
env:

src/ci/github-actions/ci.yml

-3
Original file line numberDiff line numberDiff line change
@@ -668,9 +668,6 @@ jobs:
668668
--enable-profiler
669669
SCRIPT: python x.py dist bootstrap --include-default-paths
670670
DIST_REQUIRE_ALL_TOOLS: 1
671-
# Hack around this SDK version, because it doesn't work with clang.
672-
# See https://github.com/rust-lang/rust/issues/88796
673-
WINDOWS_SDK_20348_HACK: 1
674671
<<: *job-windows-8c
675672

676673
- name: dist-i686-mingw

src/ci/scripts/install-clang.sh

-5
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,6 @@ if isMacOS; then
3939
ciCommandSetEnv AR "ar"
4040
elif isWindows && [[ ${CUSTOM_MINGW-0} -ne 1 ]]; then
4141

42-
if [[ ${WINDOWS_SDK_20348_HACK-0} -eq 1 ]]; then
43-
rm -rf '/c/Program Files (x86)/Windows Kits/10/include/10.0.20348.0'
44-
mv '/c/Program Files (x86)/Windows Kits/10/include/'10.0.{19041,20348}.0
45-
fi
46-
4742
# If we're compiling for MSVC then we, like most other distribution builders,
4843
# switch to clang as the compiler. This'll allow us eventually to enable LTO
4944
# amongst LLVM and rustc. Note that we only do this on MSVC as I don't think

0 commit comments

Comments
 (0)