diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-04-12 16:44:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-12 16:44:14 +0200 |
| commit | 9f198c1423e00fe5611d980f7124c39e3d3479ae (patch) | |
| tree | ddd4f78298b2c3746b4a85a50aa1fed04229435e /lib/systems/examples.nix | |
| parent | a710ac72770b078f9e44efce1c7e302fceaaa9ca (diff) | |
| parent | 68823d6d65b17eb900307588a723ed5acdcf98f9 (diff) | |
| download | nixpkgs-9f198c1423e00fe5611d980f7124c39e3d3479ae.tar nixpkgs-9f198c1423e00fe5611d980f7124c39e3d3479ae.tar.gz nixpkgs-9f198c1423e00fe5611d980f7124c39e3d3479ae.tar.bz2 nixpkgs-9f198c1423e00fe5611d980f7124c39e3d3479ae.tar.lz nixpkgs-9f198c1423e00fe5611d980f7124c39e3d3479ae.tar.xz nixpkgs-9f198c1423e00fe5611d980f7124c39e3d3479ae.tar.zst nixpkgs-9f198c1423e00fe5611d980f7124c39e3d3479ae.zip | |
Merge pull request #116495 from r-burns/ppc64
lib/systems: remove powerpc64 elfv1 support
Diffstat (limited to 'lib/systems/examples.nix')
| -rw-r--r-- | lib/systems/examples.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 389c4eebcc8..838b648e582 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -21,14 +21,10 @@ rec { config = "powerpc64le-unknown-linux-musl"; }; - ppc64-elfv1 = { - config = "powerpc64-unknown-linux-elfv1"; - }; - ppc64-elfv2 = { - config = "powerpc64-unknown-linux-elfv2"; + ppc64 = { + config = "powerpc64-unknown-linux-gnu"; + gcc = { abi = "elfv2"; }; # for gcc configuration }; - ppc64 = ppc64-elfv2; # default to modern elfv2 - ppc64-musl = { config = "powerpc64-unknown-linux-musl"; gcc = { abi = "elfv2"; }; # for gcc configuration |