From c17abf8111471184446370e0761736b2519b04fd Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Fri, 29 Jan 2021 19:23:10 -0800
Subject: stdenv: add powerpc64-linux

---
 pkgs/stdenv/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs/stdenv')

diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index b0db1be5f4466..d9eadf26804c6 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -54,6 +54,7 @@ in
     aarch64-linux = stagesLinux;
     mipsel-linux = stagesLinux;
     powerpc-linux = /* stagesLinux */ stagesNative;
+    powerpc64-linux = stagesLinux;
     powerpc64le-linux = stagesLinux;
     x86_64-darwin = stagesDarwin;
     x86_64-solaris = stagesNix;
-- 
cgit 1.4.1


From 76fc6d2870ff4e79e227c409dfae9378d4b12573 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Fri, 29 Jan 2021 20:08:42 -0800
Subject: bootstrap-tools-cross: add powerpc64-linux

Also check for powerpc64-linux-elfv1, which does not support musl.
---
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 ++
 pkgs/stdenv/linux/make-bootstrap-tools.nix       | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'pkgs/stdenv')

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index d1ee317a2bcf4..d8ab96952b7f2 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -17,6 +17,8 @@ in lib.mapAttrs (n: make) (with lib.systems.examples; {
   armv6l-musl  = muslpi;
   aarch64-musl = aarch64-multiplatform-musl;
   riscv64 = riscv64;
+  powerpc64 = ppc64;
+  powerpc64-musl = ppc64-musl;
   powerpc64le = powernv;
   powerpc64le-musl = musl-power;
 })
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 25cde589a923e..d99edc962b549 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -19,7 +19,8 @@ in with pkgs; rec {
   tarMinimal = gnutar.override { acl = null; };
 
   busyboxMinimal = busybox.override {
-    useMusl = !stdenv.targetPlatform.isRiscV;
+    useMusl = with stdenv.targetPlatform; !isRiscV &&
+                (system == "powerpc64-linux" -> parsed.abi.name != "elfv1");
     enableStatic = true;
     enableMinimal = true;
     extraConfig = ''
-- 
cgit 1.4.1