Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
onur-ozkan:llvm-bitcode-linker-multiple-candidates
Oct 7, 2024
Merged

skip in-tree compiler build for llvm-bitcode-linker if ci-rustc is on#130479
bors merged 1 commit into
rust-lang:masterfrom
onur-ozkan:llvm-bitcode-linker-multiple-candidates

Conversation

@onur-ozkan

@onur-ozkanonur-ozkan commented Sep 17, 2024

Copy link
Copy Markdown
Contributor

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

See #122709 (comment) for more context.

Blocker for #122709.

@rustbot

rustbot commented Sep 17, 2024

Copy link
Copy Markdown
Collaborator

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

@rustbotrustbot 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
onur-ozkan
onur-ozkan commented Sep 17, 2024
View reviewed changes
Comment threadsrc/bootstrap/src/core/build_steps/tool.rs
Comment on lines +876 to +877
if !builder.download_rustc() {
builder.ensure(compile::Std::new(self.compiler, self.compiler.host));

@onur-ozkanonur-ozkanSep 17, 2024

Copy link
Copy Markdown
ContributorAuthor

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.

Sign in to view
@onur-ozkan
onur-ozkanforce-pushed the llvm-bitcode-linker-multiple-candidates branch from 237593b to 9fcc2d2CompareSeptember 17, 2024 18:15
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@onur-ozkan
skip in-tree compiler build for llvm-bitcode-linker if ci-rustc is on
c592eac
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
onur-ozkanforce-pushed the llvm-bitcode-linker-multiple-candidates branch from 9fcc2d2 to c592eacCompareSeptember 18, 2024 04:03
@onur-ozkan

onur-ozkan commented Sep 23, 2024

Copy link
Copy Markdown
ContributorAuthor

Wishing to speed up the progress of #122709

r? bootstrap

@Kobzol

Kobzol commented Oct 7, 2024

Copy link
Copy Markdown
Member

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

bors commented Oct 7, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit c592eac has been approved by Kobzol

It is now in the queue for this repository.

@borsbors 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

onur-ozkan commented Oct 7, 2024

Copy link
Copy Markdown
ContributorAuthor

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.

@workingjubileeworkingjubilee mentioned this pull request Oct 7, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 7, 2024
@bors
Auto merge ofrust-lang#131372- workingjubilee:rollup-4tyqgx2, r=wor…
baaf3e6
…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:masterOct 7, 2024
@rustbotrustbot 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
@rust-timer
Unrolled build forrust-lang#130479
f46a037
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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@albertlarsan68albertlarsan68

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Milestone

1.83.0

Development

Successfully merging this pull request may close these issues.

7 participants

@onur-ozkan@rustbot@rust-log-analyzer@Kobzol@bors@Mark-Simulacrum@albertlarsan68