Skip to content

Commit

Permalink
Auto merge of #89380 - ehuss:fix-windows-llvm, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Sep 29, 2021
2 parents 1149193 + 0f47312 commit 24a789b
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/ci/scripts/install-clang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,9 @@ elif isWindows && [[ ${CUSTOM_MINGW-0} -ne 1 ]]; then
ciCommandSetEnv RUST_CONFIGURE_ARGS \
"${RUST_CONFIGURE_ARGS} --set llvm.clang-cl=$(pwd)/clang-rust/bin/clang-cl.exe"
fi

if isWindows; then
# GitHub image 20210928.2 added LLVM, but it is broken (and we don't want
# to use it anyways).
rm -rf /c/Program\ Files/LLVM
fi

0 comments on commit 24a789b

Please sign in to comment.