diff options
| author | bors <bors@rust-lang.org> | 2023-08-01 17:58:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-01 17:58:02 +0000 |
| commit | fe90d7dfcd571d8a60cad96ca2268b2d54cab31c (patch) | |
| tree | 228771de0ba3fffdde647619567d4226b1947252 /src/ci/scripts | |
| parent | 4896daa3985010e7d136fe0c5bf4c4e8bfc911ae (diff) | |
| parent | e947bd705fcadd580b689949962c9da5d23aba91 (diff) | |
| download | rust-fe90d7dfcd571d8a60cad96ca2268b2d54cab31c.tar.gz rust-fe90d7dfcd571d8a60cad96ca2268b2d54cab31c.zip | |
Auto merge of #113854 - klensy:aarch64-msvc-remove-hack, r=Mark-Simulacrum
aarch64-msvc: remove CI hack for bad Windows SDK version This removes hack which manually replaced windows sdk version, as it looks like useless now, as CI uses newer version: 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` (look at version) related https://github.com/rust-lang/rust/issues/88796 It's nice to have some way to assert bad version, but i don't see anything except checking env https://github.com/rust-lang/cc-rs/pull/646
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/install-clang.sh | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/ci/scripts/install-clang.sh b/src/ci/scripts/install-clang.sh index 02b72625d6e..cbb4d5765ca 100755 --- a/src/ci/scripts/install-clang.sh +++ b/src/ci/scripts/install-clang.sh @@ -39,11 +39,6 @@ if isMacOS; then 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 |