From 68823d6d65b17eb900307588a723ed5acdcf98f9 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 15 Mar 2021 19:23:35 -0700 Subject: [PATCH] stdenv/bootstrap-tools: remove powerpc64 special case Now that powerpc64 is always ELFv2, we can unconditionally use musl tools here. --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 869405a2760..e4db92b7717 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 = ''