diff options
author | Ryan Burns <rtburns@protonmail.com> | 2021-01-29 20:08:42 -0800 |
---|---|---|
committer | Ryan Burns <rtburns@protonmail.com> | 2021-01-30 12:34:30 -0800 |
commit | 76fc6d2870ff4e79e227c409dfae9378d4b12573 (patch) | |
tree | 52a93b91e1c07857385c68cd9dc28268e03e958b /pkgs/stdenv | |
parent | c17abf8111471184446370e0761736b2519b04fd (diff) | |
download | nixlib-76fc6d2870ff4e79e227c409dfae9378d4b12573.tar nixlib-76fc6d2870ff4e79e227c409dfae9378d4b12573.tar.gz nixlib-76fc6d2870ff4e79e227c409dfae9378d4b12573.tar.bz2 nixlib-76fc6d2870ff4e79e227c409dfae9378d4b12573.tar.lz nixlib-76fc6d2870ff4e79e227c409dfae9378d4b12573.tar.xz nixlib-76fc6d2870ff4e79e227c409dfae9378d4b12573.tar.zst nixlib-76fc6d2870ff4e79e227c409dfae9378d4b12573.zip |
bootstrap-tools-cross: add powerpc64-linux
Also check for powerpc64-linux-elfv1, which does not support musl.
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 | ||||
-rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index d1ee317a2bcf..d8ab96952b7f 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 25cde589a923..d99edc962b54 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 = '' |