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

Bump download-ci-llvm-stamp for loong support #110490

Merged
merged 1 commit into from
Apr 18, 2023
Merged

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Apr 18, 2023

This was missed in #96971 and resulted in the LLVM we cache in CI being different from the one built locally. We didn't catch it because nothing tested the loong support.

Fixes #110474.

r? @nikic

This was missed in rust-lang#96971 and
resulted in the LLVM we cache in CI being different from the one built
locally. We didn't catch it because nothing tested the loong support.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Apr 18, 2023
@nikic
Copy link
Contributor

nikic commented Apr 18, 2023

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 18, 2023

📌 Commit 6787925 has been approved by nikic

It is now in the queue for this repository.

@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 Apr 18, 2023
@jyn514
Copy link
Member Author

jyn514 commented Apr 18, 2023

lol, I actually found this bug a week ago but didn't realize what was going on:

rust/src/bootstrap/dist.rs

Lines 1968 to 1980 in f795a15

// FIXME: for reasons I don't understand, the LLVM so in the `rustc` component is different than the one in `rust-dev`.
// Only the one in `rustc` works with the downloaded compiler.
if builder.download_rustc() && target == builder.build.build {
let src_libdir = builder.ci_rustc_dir(target).join("lib");
for entry in t!(std::fs::read_dir(&src_libdir)) {
let entry = t!(entry);
if entry.file_name().to_str().unwrap().starts_with("libLLVM-") {
install_llvm_file(builder, &entry.path(), dst_libdir);
return !builder.config.dry_run();
}
}
panic!("libLLVM.so not found in src_libdir {}!", src_libdir.display());
}

I think we can remove that hack after this is merged :) or I can do it now, I'm just not able to test until after the artifacts are uploaded.

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 18, 2023
…llaumeGomez

Rollup of 5 pull requests

Successful merges:

 - rust-lang#110417 (Spelling compiler)
 - rust-lang#110441 (5 little typos)
 - rust-lang#110485 (Fix bootstrap locking)
 - rust-lang#110488 (Add a failing rustdoc-ui test for public infinite recursive type)
 - rust-lang#110490 (Bump `download-ci-llvm-stamp` for loong support)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e8f7b5a into rust-lang:master Apr 18, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 18, 2023
@jyn514 jyn514 deleted the bump-llvm branch April 18, 2023 20:42
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 19, 2023
…rtlarsan68

Don't special-case download-rustc in `maybe_install_llvm`

This is no longer necessary now that the llvm in `rust-dev` matches the one in `rustc`.

cc rust-lang#110490 (comment), rust-lang#110263
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The LLVM we ship in rust-dev doesn't match the LLVM we ship in the rustc component
4 participants