Skip to content

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

Merged
Artturin merged 1 commit intostagingfrom
unknown repository
Oct 27, 2023
Merged

gcc: change "-stage-static" to "-nolibc" and "-stage-final" to ""#240596
Artturin merged 1 commit intostagingfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@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).

@ofborg ofborg bot added the 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. label Jun 29, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jun 29, 2023
@ghost
Copy link
Copy Markdown
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
Copy Markdown
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 marked this pull request as ready for review October 25, 2023 04:29
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. and removed 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Oct 25, 2023
@ghost ghost requested a review from Artturin October 26, 2023 23:14
@ghost
Copy link
Copy Markdown
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 <Artturin@artturin.com>
Co-authored-by: John Ericson <git@JohnEricson.me>
@Artturin Artturin merged commit 4693035 into NixOS:staging Oct 27, 2023
@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

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants