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

skip in-tree compiler build for llvm-bitcode-linker if ci-rustc is on #130479

Merged

Conversation

onur-ozkan
Copy link
Member

Similar to #108767, resolves the multiple candidates problem for ci-rustc.

See #122709 (comment) for more context.

Blocker for #122709.

@rustbot
Copy link
Collaborator

rustbot commented Sep 17, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 Sep 17, 2024
Comment on lines +876 to +877
if !builder.download_rustc() {
builder.ensure(compile::Std::new(self.compiler, self.compiler.host));
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be resolved within the impl Step for Std logic, but I couldn't find a simple and clean solution without requiring a refactor. I wanted to unblock the #122709 PR in the simplest way possible without introducing complex changes to the std bootstrapping logic.

@rust-log-analyzer

This comment has been minimized.

@onur-ozkan onur-ozkan force-pushed the llvm-bitcode-linker-multiple-candidates branch from 237593b to 9fcc2d2 Compare September 17, 2024 18:15
@rust-log-analyzer

This comment has been minimized.

@onur-ozkan onur-ozkan force-pushed the llvm-bitcode-linker-multiple-candidates branch from 9fcc2d2 to c592eac Compare September 18, 2024 04:03
@onur-ozkan
Copy link
Member Author

Wishing to speed up the progress of #122709

r? bootstrap

@Kobzol
Copy link
Contributor

Kobzol commented Oct 7, 2024

It's annoying that the sysroot build logic is distributed amongst multiple steps :/ Anyway, no need for that to block this PR.

@bors r+

@bors
Copy link
Contributor

bors commented Oct 7, 2024

📌 Commit c592eac has been approved by Kobzol

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 Oct 7, 2024
@onur-ozkan
Copy link
Member Author

It's annoying that the sysroot build logic is distributed amongst multiple steps :/ Anyway, no need for that to block this PR.

@bors r+

I am not happy with that as well (#130479 (comment)), this is just a quick fix for #122709.

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 7, 2024
…kingjubilee

Rollup of 7 pull requests

Successful merges:

 - rust-lang#128721 (Don't allow the `#[pointee]` attribute where it doesn't belong)
 - rust-lang#130479 (skip in-tree compiler build for llvm-bitcode-linker if ci-rustc is on)
 - rust-lang#130899 (Couple of changes to make it easier to compile rustc for wasm)
 - rust-lang#131225 (`rustc_borrowck` memory management tweaks)
 - rust-lang#131351 (Remove valgrind test suite and support from compiletest, bootstrap and opt-dist)
 - rust-lang#131359 (Fix used_underscore_binding in rustc_serialize)
 - rust-lang#131367 (Mark Boxy as on vacation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8cd9d95 into rust-lang:master Oct 7, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 7, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 7, 2024
Rollup merge of rust-lang#130479 - onur-ozkan:llvm-bitcode-linker-multiple-candidates, r=Kobzol

skip in-tree compiler build for llvm-bitcode-linker if ci-rustc is on

Similar to rust-lang#108767, resolves the `multiple candidates` problem for ci-rustc.

See rust-lang#122709 (comment) for more context.

Blocker for rust-lang#122709.
@onur-ozkan onur-ozkan deleted the llvm-bitcode-linker-multiple-candidates branch October 8, 2024 09:11
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.

7 participants