Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update clang to 12.0.0 on Windows and macOS #84894

Merged
merged 2 commits into from
May 4, 2021

Conversation

joshtriplett
Copy link
Member

Needed for #84764 . Tarballs
already uploaded to the CI mirror bucket.

Currently, we have LLVM tarballs for win64, generated by someone running
the installer via wine and tarring up the result.

7z knows how to extract NSIS installers directly, and the result is
identical to our tarball, except that it doesn't include `Uninstall.exe`
(which we don't care about) and it includes the NSIS plugin directory
(which we also don't care about).

This simplifies the process of upgrading CI, and allows us to just
mirror the upstream release .exe directly. This also improves our
supply chain.
Needed for rust-lang#84764 . Tarballs
already uploaded to the CI mirror bucket.
@rust-highfive
Copy link
Collaborator

r? @kennytm

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 4, 2021
@joshtriplett
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented May 4, 2021

⌛ Trying commit b9ef51f with merge a8d0afd4be04441c537db76036b1e6bafb7cc6c8...

@bors
Copy link
Contributor

bors commented May 4, 2021

☀️ Try build successful - checks-actions
Build commit: a8d0afd4be04441c537db76036b1e6bafb7cc6c8 (a8d0afd4be04441c537db76036b1e6bafb7cc6c8)

@joshtriplett
Copy link
Member Author

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented May 4, 2021

📌 Commit b9ef51f has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 4, 2021
@Mark-Simulacrum
Copy link
Member

We should try to make sure that the build still works without this on Windows/macOS, though, as expecting really recent toolchains isn't great. My understanding is that we should only need this on aarch64 Windows, perhaps, so in that sense it shouldn't be too necessary for most people?

@bors
Copy link
Contributor

bors commented May 4, 2021

⌛ Testing commit b9ef51f with merge dc5f2cd...

@joshtriplett
Copy link
Member Author

This is needed when building an aarch64 target on a Windows host. It's only a requirement on Windows; other platforms can continue to use older compilers. It seems more reasonable to expect an up-to-date toolchain on Windows, since it would normally be installed directly rather than obtained from a distribution. And if people specifically need to build with an older compiler, they could potentially disable aarch64 target support.

@bors
Copy link
Contributor

bors commented May 4, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing dc5f2cd to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 4, 2021
@bors bors merged commit dc5f2cd into rust-lang:master May 4, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 4, 2021
@joshtriplett joshtriplett deleted the clang-12 branch May 4, 2021 18:51
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 8, 2021
…acrum

[beta] Backport rust-lang#84894 to fix beta CI

Currently, beta backports fail with this failure: rust-lang#86036 (comment)
```
STL1000: Unexpected compiler version, expected Clang 11.0.0 or newer.
```

The previous beta backport was successful because it uses a Visual Studio tool v14.28.29910 but now CI uses v14.29.30037.
rust-lang#84894 updated clang to 12 so master didn't catch this change, I guess. Hopefully, it fixes CI failures on beta.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants