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

gcc: change "-stage-static" to "-nolibc" and "-stage-final" to "" #240596

Merged
merged 1 commit into from Oct 27, 2023
Merged

gcc: change "-stage-static" to "-nolibc" and "-stage-final" to "" #240596

merged 1 commit into from Oct 27, 2023

Conversation

ghost
Copy link

@ghost ghost commented Jun 29, 2023

Since

our cross compiler bootstrap no longer has a "static only" stage. To avoid confusion, crossStageStatic was renamed gccWithoutTargetLibc; this is just an attrname so it didn't have to go to staging. Removing the -stage-static from the corresponding pnames does however have to go to staging. That's what this PR does.

This commit changes the target suffix for the first-stage cross compiler from -stage-static to -nolibc, and eliminates the target suffix from the final-stage cross compiler (previously -stage-final).

@ghost
Copy link
Author

ghost commented Jul 13, 2023

See #243194

@ghost ghost closed this Jul 13, 2023
@ghost ghost deleted the pr/gcc/stage-rename branch July 13, 2023 03:15
avnik pushed a commit to avnik/nixpkgs that referenced this pull request Oct 14, 2023
This commit is reverted in NixOS#240596 (which must go to staging).

(cherry-picked from commit 96a2f1b)
@ghost ghost restored the pr/gcc/stage-rename branch October 25, 2023 04:19
@ghost ghost reopened this Oct 25, 2023
@github-actions github-actions bot added 6.topic: lib The Nixpkgs function library and removed 6.topic: lib The Nixpkgs function library labels Oct 25, 2023
@ghost
Copy link
Author

ghost commented Oct 25, 2023

Hrm, I thought this was included with one the PRs that got merged, but evidently it was not.

@ghost ghost requested a review from Artturin October 26, 2023 23:14
@ghost
Copy link
Author

ghost commented Oct 27, 2023

@ofborg eval

This commit changes the target suffix for the first-stage cross
compiler from `-stage-static` to `-nolibc`, and eliminates the
target suffix from the final-stage cross compiler (previously
`-stage-final`).

Co-authored-by: Artturi <[email protected]>
Co-authored-by: John Ericson <[email protected]>
@Artturin Artturin merged commit 4693035 into NixOS:staging Oct 27, 2023
21 of 22 checks passed
@ghost ghost deleted the pr/gcc/stage-rename branch October 28, 2023 00:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants