stage.nix: revert deletion of gcc.abi="elfv2" from 82ff1f5 #191436
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
requested review from
nbp,
Ericson2314 and
matthewbauer
as code owners
Commit 82ff1f5 in #182807 removed two lines from stage.nix which were responsible for making sure the `gcc` for `pkgsStatic` on powerpc64 was built with the `--with-abi=elfv2` flag. Unfortunately this causes build failures for `pkgsCross.ppc64.pkgsStatic`, as reported here: #182807 (comment) This commit reverts the deletion. Unfortunately ugly kludges like this are necessary because nixpkgs' `lib/systems/` doesn't understand the difference between a libc and an abi. So we have no clean way to tell nixpkgs "musl on big-endian powerpc64 always uses the ELFv2 ABI" -- it thinks that musl is an ABI. Until that gets fixed there is no better way to add the flag.
minijackson
approved these changes
Sep 16, 2022
|
Not your fault, I missed it too. |
ghost
mentioned this pull request
3 tasks
OPNA2608
approved these changes
Sep 24, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CC: @OPNA2608 @Mindavi @minijackson
Description of changes
Commit 82ff1f5 in #182807 removed two lines from stage.nix which were responsible for making sure the
gccforpkgsStaticon powerpc64 was built with the--with-abi=elfv2flag.Unfortunately this causes build failures for
pkgsCross.ppc64.pkgsStatic, as reported here:#182807 (comment)
This commit reverts the deletion.
Unfortunately ugly kludges like this are necessary because nixpkgs'
lib/systems/doesn't understand the difference between a libc and an abi. So we have no clean way to tell nixpkgs "musl on big-endian powerpc64 always uses the ELFv2 ABI" -- it thinks that musl is an ABI. Until that gets fixed there is no better way to add the flag.Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes