nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-16 15:48:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkgsStatic: handle ELFv1/2 ABIs

Browse Source
This commit is contained in:
Minijackson 2022-07-25 12:23:45 +02:00 committed by Rick van Schijndel
parent 345595a8b8
commit 82ff1f5db1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/stage.nix
View File

@ -78,6 +78,8 @@ let
gnueabihf = lib.systems.parse.abis.musleabihf; gnueabihf = lib.systems.parse.abis.musleabihf;
gnuabin32 = lib.systems.parse.abis.muslabin32; gnuabin32 = lib.systems.parse.abis.muslabin32;
gnuabi64 = lib.systems.parse.abis.muslabi64; gnuabi64 = lib.systems.parse.abis.muslabi64;
gnuabielfv2 = lib.systems.parse.abis.musl;
gnuabielfv1 = lib.systems.parse.abis.musl;
# The following two entries ensure that this function is idempotent. # The following two entries ensure that this function is idempotent.
musleabi = lib.systems.parse.abis.musleabi; musleabi = lib.systems.parse.abis.musleabi;
musleabihf = lib.systems.parse.abis.musleabihf; musleabihf = lib.systems.parse.abis.musleabihf;
@ -257,8 +259,6 @@ let
crossSystem = { crossSystem = {
isStatic = true; isStatic = true;
parsed = makeMuslParsedPlatform stdenv.hostPlatform.parsed; parsed = makeMuslParsedPlatform stdenv.hostPlatform.parsed;
} // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") {
gcc.abi = "elfv2";
}; };
}); });
}; };