cpython: fix extensions when using a musl toolchain#110293
cpython: fix extensions when using a musl toolchain#110293flokli merged 1 commit intoNixOS:masterfrom
Conversation
|
@pjjw do you have an easy before/after repro? |
|
@flokli yea- try It's kind of explained in the file itself, but above the section where this change is made there's a link to cpython's configure scripts, and you can see there that it will never detect musl because it's choosing from enumerated options of which musl is not one. musl showing up in the first place as part of the triple in sysconfigdata is purely an artifact of how we're dealing with cross-compilation- python itself will never use that string. |
|
@GrahamcOfBorg build pkgsMusl.python39Packages.bootstrapped-pip and then compare to hydra for the broken one. |
|
oops, i fed something rotten to the bot. |
lopsided98
left a comment
There was a problem hiding this comment.
Haven't tested, but looks reasonable to me. One minor suggestion would be to change the variable from fakeAbiName to pythonAbiName.
4732cc9 to
b8f4a97
Compare
|
feel free to squash that cleanup commit out, only didn't force-push because github doesn't handle comments well in that case. |
b8f4a97 to
858eebe
Compare
|
squashed and merged, thanks! |
Motivation for this change
it looks like while attempting to fix cross-compilation in #98915, python extensions under musl-libc were entirely broken due to python's build process not differentiating between musl and gnu abi. this fixes this.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)