diff options
| author | bors <bors@rust-lang.org> | 2021-09-10 12:26:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-09-10 12:26:55 +0000 |
| commit | 7bf0736e130e2203c58654f7353dbf9575e49d5c (patch) | |
| tree | bc6e76c9882a8471729177dac161dc49d0df9bae /src/ci/scripts | |
| parent | 497ee321af3b8496eaccd7af7b437f18bab81abf (diff) | |
| parent | 8059bc1069b88a51ec2dfc2483854b9a854b1994 (diff) | |
| download | rust-7bf0736e130e2203c58654f7353dbf9575e49d5c.tar.gz rust-7bf0736e130e2203c58654f7353dbf9575e49d5c.zip | |
Auto merge of #88797 - m-ou-se:uhhhh, r=pietroalbini
Work around CI issue with windows sdk 10.0.20348.0. See https://github.com/rust-lang/rust/issues/88796#issuecomment-916844522
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/install-clang.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ci/scripts/install-clang.sh b/src/ci/scripts/install-clang.sh index 7b540b5c6e9..fd29d3a022a 100755 --- a/src/ci/scripts/install-clang.sh +++ b/src/ci/scripts/install-clang.sh @@ -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 |