diff options
| author | John Ericson <git@JohnEricson.me> | 2021-01-30 16:26:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-30 16:26:06 -0500 |
| commit | 5fc5e83808c1f9ce5b414a1d596f6427b77ac180 (patch) | |
| tree | c8a1f403c89f13ae51830d1706d3737ccef3c4e9 /pkgs/stdenv | |
| parent | fccda5aae6659e8abce91503194d618c2bfc6e59 (diff) | |
| parent | 5530a3adbe9be842f22cd83b59b06cdd5a94308e (diff) | |
Merge pull request #111345 from r-burns/ppc64-big-endian
Enable PPC64 (big-endian)
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 = '' |