-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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
skip in-tree compiler build for llvm-bitcode-linker if ci-rustc is on #130479
Conversation
rustbot has assigned @Mark-Simulacrum. Use |
if !builder.download_rustc() { | ||
builder.ensure(compile::Std::new(self.compiler, self.compiler.host)); |
There was a problem hiding this comment.
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.
This comment has been minimized.
This comment has been minimized.
237593b
to
9fcc2d2
Compare
This comment has been minimized.
This comment has been minimized.
Signed-off-by: onur-ozkan <work@onurozkan.dev>
9fcc2d2
to
c592eac
Compare
Wishing to speed up the progress of #122709 r? bootstrap |
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. |
…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
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.
Similar to #108767, resolves the
multiple candidates
problem for ci-rustc.See #122709 (comment) for more context.
Blocker for #122709.