Skip to content

Commit 06b37f1

Browse files
borsehuss
authored andcommitted
Auto merge of rust-lang#89380 - ehuss:fix-windows-llvm, r=Mark-Simulacrum
Fix Windows LLVM issue. GitHub image 20210928.2 added LLVM 12.0.1 to the stock image. However, the `lldb` executable doesn't work, it fails with: > C:/Program Files/LLVM/bin/lldb.exe: error while loading shared libraries: ?: cannot open shared object file: No such file or directory We probably don't want to start testing LLDB on windows anyways (at least not without intent). The hacky solution for now is to just delete the system LLVM.
1 parent cfa1cd0 commit 06b37f1

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Diff for: src/ci/scripts/install-clang.sh

+6
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,9 @@ elif isWindows && [[ ${CUSTOM_MINGW-0} -ne 1 ]]; then
6161
ciCommandSetEnv RUST_CONFIGURE_ARGS \
6262
"${RUST_CONFIGURE_ARGS} --set llvm.clang-cl=$(pwd)/clang-rust/bin/clang-cl.exe"
6363
fi
64+
65+
if isWindows; then
66+
# GitHub image 20210928.2 added LLVM, but it is broken (and we don't want
67+
# to use it anyways).
68+
rm -rf /c/Program\ Files/LLVM
69+
fi

0 commit comments

Comments
 (0)