diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-31 00:46:33 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-31 00:46:33 +0000 |
commit | 81337921f56fd83a795fbcda58f43db555d99fe0 (patch) | |
tree | 490bf3b9911d7519fa4b95ecb9728788c481c4b9 /pkgs/stdenv | |
parent | 048e0d3f87850f2d1bec2eb8dbac93fc6a1a2dd2 (diff) | |
parent | 45aaf5e0c825c45c8bce6a203a5dd711cda350e8 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/default.nix | 1 | ||||
-rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 | ||||
-rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 3 |
3 files changed, 5 insertions, 1 deletions
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; 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 e4db92b7717c2..869405a27607c 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 = '' |