Skip to content

Add CI checks with LLVM sysroot#858

Open
GuillaumeGomez wants to merge 2 commits into
rust-lang:masterfrom
GuillaumeGomez:llvm-sysroot
Open

Add CI checks with LLVM sysroot#858
GuillaumeGomez wants to merge 2 commits into
rust-lang:masterfrom
GuillaumeGomez:llvm-sysroot

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Fixes #850.

Comment thread build_system/src/config.rs Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I believe we still need the -Zcodegen-backend flag even when using the LLVM sysroot.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I guess we'll see soon enough. :3

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Well, the test will just use cg_llvm without this, so this is not what we want.

Comment thread build_system/src/config.rs Outdated
Comment on lines +316 to +317
use_system_gcc: bool,
with_llvm_sysroot: bool,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I would use 1 or 2 enums here to make the caller code clearer.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

In this case, the added value is pretty minimal imo.

Comment thread build_system/src/build.rs Outdated
run_command_with_output_and_env(&command, None, Some(&env))?;

args.config_info.setup(&mut env, false)?;
args.config_info.setup(&mut env, false, false)?;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please add a comment to mention that we always build the sysroot with cg_gcc and we don't need to build the sysroot with cg_llvm since it's already distributed by rustup and we can just not provide --sysroot to use it.

@GuillaumeGomez GuillaumeGomez force-pushed the llvm-sysroot branch 2 times, most recently from e14606b to 3f1d43c Compare February 25, 2026 21:58
@rustbot

This comment has been minimized.

@rustbot

rustbot commented Jul 2, 2026

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@GuillaumeGomez GuillaumeGomez force-pushed the llvm-sysroot branch 4 times, most recently from d6e114a to cfc5782 Compare July 2, 2026 22:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add CI where we test with a sysroot compiled by LLVM

3 participants