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 Codegen{GCC,Cranelift} when using CI rustc #123373

Merged
merged 1 commit into from
Apr 14, 2024

Conversation

onur-ozkan
Copy link
Member

CI rustc uses the default codegen backend, therefore we can't run CodegenGCC and CodegenCranelift tests when using it.

cc @bjorn3 (to make sure I am not doing anything wrong)

Fixes #123331

Signed-off-by: onur-ozkan <work@onurozkan.dev>
@rustbot
Copy link
Collaborator

rustbot commented Apr 2, 2024

r? @albertlarsan68

rustbot has assigned @albertlarsan68.
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 Apr 2, 2024
@bjorn3
Copy link
Member

bjorn3 commented Apr 2, 2024

If you test stage2 rather than stage1, cg_clif and cg_gcc would be built, right?

@onur-ozkan
Copy link
Member Author

If you test stage2 rather than stage1, cg_clif and cg_gcc would be built, right?

No, they will not. Here some more context:

// If we're downloading a compiler from CI, we can use the same compiler for all stages other than 0.
if builder.download_rustc() {
let sysroot =
builder.ensure(Sysroot { compiler: target_compiler, force_recompile: false });
// Ensure that `libLLVM.so` ends up in the newly created target directory,
// so that tools using `rustc_private` can use it.
dist::maybe_install_llvm_target(builder, target_compiler.host, &sysroot);
// Lower stages use `ci-rustc-sysroot`, not stageN
if target_compiler.stage == builder.top_stage {
builder.info(&format!("Creating a sysroot for stage{stage} compiler (use `rustup toolchain link 'name' build/host/stage{stage}`)", stage=target_compiler.stage));
}
return target_compiler;

@onur-ozkan onur-ozkan added the A-contributor-roadblock Area: Makes things more difficult for new contributors to rust itself label Apr 14, 2024
@onur-ozkan
Copy link
Member Author

Do anyone have time to review this? @rust-lang/bootstrap

@Mark-Simulacrum
Copy link
Member

@bors r+

This seems OK for now (given that it sounds like it doesn't work to not do this anyway), but I'd expect it to be possible for CI-downloaded rustc to link against a locally built cranelift/gcc codegen backend.

@bors
Copy link
Contributor

bors commented Apr 14, 2024

📌 Commit 167e3ab has been approved by Mark-Simulacrum

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 14, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 14, 2024
…llaumeGomez

Rollup of 5 pull requests

Successful merges:

 - rust-lang#120900 (std: use `stream_position` where applicable)
 - rust-lang#123373 (skip Codegen{GCC,Cranelift} when using CI rustc)
 - rust-lang#123618 (Discard overflow obligations in `impl_may_apply`)
 - rust-lang#123905 (rustdoc: check redundant explicit links with correct itemid)
 - rust-lang#123915 (improve documentation slightly regarding some pointer methods)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f3a68fb into rust-lang:master Apr 14, 2024
11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 14, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 14, 2024
Rollup merge of rust-lang#123373 - onur-ozkan:skip-codegen, r=Mark-Simulacrum

skip Codegen{GCC,Cranelift} when using CI rustc

CI rustc uses the default codegen backend, therefore we can't run `CodegenGCC` and `CodegenCranelift` tests when using it.

cc `@bjorn3` (to make sure I am not doing anything wrong)

Fixes rust-lang#123331
@onur-ozkan onur-ozkan deleted the skip-codegen branch April 15, 2024 04:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-contributor-roadblock Area: Makes things more difficult for new contributors to rust itself 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.

bootstrap fails to find codegen-backends folder
6 participants