about summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-04-12 16:44:14 +0200
committerGitHub <noreply@github.com>2021-04-12 16:44:14 +0200
commit9f198c1423e00fe5611d980f7124c39e3d3479ae (patch)
treeddd4f78298b2c3746b4a85a50aa1fed04229435e /pkgs/stdenv
parenta710ac72770b078f9e44efce1c7e302fceaaa9ca (diff)
parent68823d6d65b17eb900307588a723ed5acdcf98f9 (diff)
Merge pull request #116495 from r-burns/ppc64
lib/systems: remove powerpc64 elfv1 support
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 869405a27607c..e4db92b7717c2 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -19,8 +19,7 @@ in with pkgs; rec {
   tarMinimal = gnutar.override { acl = null; };
 
   busyboxMinimal = busybox.override {
-    useMusl = with stdenv.targetPlatform; !isRiscV &&
-                (system == "powerpc64-linux" -> parsed.abi.name != "elfv1");
+    useMusl = !stdenv.targetPlatform.isRiscV;
     enableStatic = true;
     enableMinimal = true;
     extraConfig = ''