diff options
| author | bors <bors@rust-lang.org> | 2024-05-10 00:04:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-10 00:04:22 +0000 |
| commit | a6e87c546dd806b2f8eb7bb314defc56dc190e4d (patch) | |
| tree | 8bc87b8009e0579727c4b18ebfb84de70f2f036a /src/ci/docker | |
| parent | 8f9080db423ca0fb6bef0686ce9a93940cdf1f13 (diff) | |
| parent | 5212e07a4e8c442a8e9024c929a73f308299fea3 (diff) | |
| download | rust-a6e87c546dd806b2f8eb7bb314defc56dc190e4d.tar.gz rust-a6e87c546dd806b2f8eb7bb314defc56dc190e4d.zip | |
Auto merge of #124850 - dpaoliello:clang2022, r=Kobzol
Upgrade pre-built Clang used in MSVC and MacOS builds, move MSVC builds to Server 2022 Fixes #92948 Example working MacOS and Windows builds: <https://github.com/rust-lang/rust/actions/runs/8989360201> There is a [bug in Clang 18](https://github.com/llvm/llvm-project/pull/81849) that causes issues when building for Arm64 in later parts of the build (specifically `libgit2`). As a workaround, we will still use the pre-built Clang to build LLVM but will use MSVC for the rest of the Arm64 build.
Diffstat (limited to 'src/ci/docker')
| -rwxr-xr-x | src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh index 005f4537c84..f3591a69bee 100755 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh @@ -4,6 +4,7 @@ set -ex source shared.sh +# Try to keep the LLVM version here in sync with src/ci/scripts/install-clang.sh LLVM=llvmorg-18.1.0 mkdir llvm-project |