Skip to content

Disable cfg check for the recently-merged target features to allow stdarch update #1768

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

Merged
merged 1 commit into from
Apr 10, 2025

Conversation

sayantn
Copy link
Contributor

@sayantn sayantn commented Apr 10, 2025

The stdarch update is currently giving doc errors, which #1767 fixes. But then it will give unknown cfg errors due to the recently added amx and riscv target features, so this pr temporarily disables those checks. Revert after the bump is successful

@rustbot
Copy link
Collaborator

rustbot commented Apr 10, 2025

r? @Amanieu

rustbot has assigned @Amanieu.
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

@Amanieu Amanieu enabled auto-merge April 10, 2025 11:19
@Amanieu Amanieu added this pull request to the merge queue Apr 10, 2025
Merged via the queue into rust-lang:master with commit 6780277 Apr 10, 2025
60 checks passed
@sayantn sayantn deleted the bootstrap-fixes branch April 10, 2025 23:19
@a4lg
Copy link
Contributor

a4lg commented Apr 15, 2025

@sayantn
I'd like to ask how do we know that unknown cfg errors are fixed (and/or which CI failures to track) to know the right timing to revert this PR.
Just making documentation seems working on my local environment so I think there is a failing configuration.

@sayantn
Copy link
Contributor Author

sayantn commented Apr 15, 2025

These unknown cfg errors are obtained when stdarch is built as a part of libstd, by itself stdarch should compile fine - the bootstrapping architecture of rustc creates the problem because the stage0 compiler doesn't yet know about those new target features.

It should be good to revert once a stdarch update gets merged, or the bootstrap version gets bumped

@Urgau
Copy link
Member

Urgau commented Apr 15, 2025

It should be good to revert once a stdarch update gets merged, or the bootstrap version gets bumped

I think this could be handled by the special bootstrap cfg set by the rust-lang/rust build-system.

@sayantn
Copy link
Contributor Author

sayantn commented Apr 15, 2025

afaik this repo doesn't use cfg(bootstrap) because the update cfgs commit (which removes all cfg(bootstrap) items after the bootstrap bump) wouldn't work here because this is still a submodule, not a subtree. Using cfg(bootstrap) here will require a PR here after bootstrap bump, and a stdarch submodule update in rustc, which might create a lot of problems, because stdarch updates are typically problematic as stdarch CI and rustc CI don't match perfectly

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 16, 2025
…nieu

Update stdarch submodule

rust-lang/stdarch#1768 is needed to unblock the `cg_gcc` current sync so this PR updates the `stdarch` submodule.

cc `@antoyo`
r? `@Amanieu`
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.

5 participants