pkgsStatic: handle ELFv1/2 ABIs

minijackson · Mindavi · commit 82ff1f5db12f · 2022-08-28T21:46:44.000+02:00
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
@@ -78,6 +78,8 @@ let
           gnueabihf = lib.systems.parse.abis.musleabihf;
           gnuabin32 = lib.systems.parse.abis.muslabin32;
           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.
           musleabi = lib.systems.parse.abis.musleabi;
           musleabihf = lib.systems.parse.abis.musleabihf;
@@ -257,8 +259,6 @@ let
       crossSystem = {
         isStatic = true;
         parsed = makeMuslParsedPlatform stdenv.hostPlatform.parsed;
-      } // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") {
-        gcc.abi = "elfv2";
       };
     });
   };
