diff options
Diffstat (limited to 'lib/systems')
-rw-r--r-- | lib/systems/doubles.nix | 4 | ||||
-rw-r--r-- | lib/systems/parse.nix | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 741839de3aa..e577059687b 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -35,8 +35,8 @@ let # NetBSD "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" - "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" - "riscv64-netbsd" "x86_64-netbsd" + "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" + "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" # none "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 386f252f2ba..77e941a913c 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -127,9 +127,10 @@ rec { # GNU build systems assume that older NetBSD architectures are using a.out. gnuNetBSDDefaultExecFormat = cpu: - if (cpu.family == "x86" && cpu.bits == 32) || - (cpu.family == "arm" && cpu.bits == 32) || - (cpu.family == "sparc" && cpu.bits == 32) + if (cpu.family == "arm" && cpu.bits == 32) || + (cpu.family == "sparc" && cpu.bits == 32) || + (cpu.family == "m68k" && cpu.bits == 32) || + (cpu.family == "x86" && cpu.bits == 32) then execFormats.aout else execFormats.elf; |