Skip to content

Bootstrap config: libgccjit libs dir #149354

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.

Sign up for GitHub

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

Jump to bottom
Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Bootstrap config: libgccjit libs dir #149354

wants to merge 6 commits into from
+84 −28

Conversation

@antoyo
Copy link
Contributor

@antoyo antoyo commented Nov 26, 2025

r? @Kobzol

@rustbot
Copy link
Collaborator

rustbot commented Nov 26, 2025

This PR changes how GCC is built. Consider updating src/bootstrap/download-ci-gcc-stamp.

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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 Nov 26, 2025
@rustbot
Copy link
Collaborator

rustbot commented Nov 26, 2025

Kobzol is not on the review rotation at the moment.
They may take a while to respond.

@antoyo antoyo marked this pull request as draft November 26, 2025 14:04
@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 26, 2025
antoyo
antoyo commented Nov 26, 2025
View reviewed changes
src/bootstrap/src/core/build_steps/gcc.rs
pub libgccjit: PathBuf,
/// Path to a built or downloaded libgccjit.
/// Is None when setting libgccjit-libs-dir.
/// FIXME: it seems wrong to make this an Option.
Copy link
Contributor Author

@antoyo antoyo Nov 26, 2025

Choose a reason for hiding this comment

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

@Kobzol: What are your thoughts about this?

antoyo
antoyo commented Nov 26, 2025
View reviewed changes
src/bootstrap/src/core/build_steps/gcc.rs Outdated
/// GCC, it's fine for us to not try to avoid doing so.
pub fn get_gcc_build_status(builder: &Builder<'_>, target: TargetSelection) -> GccBuildStatus {
if matches!(builder.config.gcc_ci_mode, crate::core::config::GccCiMode::CopyFromLibsDir) {
// TODO: check if this is OK.
Copy link
Contributor Author

@antoyo antoyo Nov 26, 2025

Choose a reason for hiding this comment

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

Note to myself: don't forget this.

@antoyo
Copy link
Contributor Author

antoyo commented Nov 26, 2025

@Kobzol: I'm sending this PR to gather some feedback from you or others.

How can I add tests for this new bootstrap config?
Where should I document this new config?

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Kobzol Kobzol

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@antoyo @rustbot @rust-log-analyzer @Kobzol