diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-10-30 13:46:01 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-10-30 13:46:01 -0500 |
commit | 2634d376175d300c1c2572defe8c6d348ad61e20 (patch) | |
tree | 7c7798c6e97f390e38ea75ba9f6a2dc88391491d | |
parent | 7a03d2d65f5fcb06ef693a442b806a34ab0803c7 (diff) | |
download | nixlib-2634d376175d300c1c2572defe8c6d348ad61e20.tar nixlib-2634d376175d300c1c2572defe8c6d348ad61e20.tar.gz nixlib-2634d376175d300c1c2572defe8c6d348ad61e20.tar.bz2 nixlib-2634d376175d300c1c2572defe8c6d348ad61e20.tar.lz nixlib-2634d376175d300c1c2572defe8c6d348ad61e20.tar.xz nixlib-2634d376175d300c1c2572defe8c6d348ad61e20.tar.zst nixlib-2634d376175d300c1c2572defe8c6d348ad61e20.zip |
systems/examples: add i686 & x86-64 embedded
Fixes #28160
-rw-r--r-- | lib/systems/examples.nix | 10 | ||||
-rw-r--r-- | lib/systems/parse.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/release-cross.nix | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 2bfa9700ccd1..a40c38924245 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -118,6 +118,16 @@ rec { libc = "newlib"; }; + i686-embedded = { + config = "i686-elf"; + libc = "newlib"; + }; + + x86_64-embedded = { + config = "x86_64-elf"; + libc = "newlib"; + }; + # # Darwin # diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index a390a098c60f..db97a5c4b33b 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -267,6 +267,8 @@ rec { then { cpu = elemAt l 0; kernel = "windows"; abi = "cygnus"; } else if (elemAt l 1 == "eabi") then { cpu = elemAt l 0; vendor = "none"; kernel = "none"; abi = elemAt l 1; } + else if (elemAt l 1 == "elf") + then { cpu = elemAt l 0; vendor = "none"; kernel = "none"; abi = elemAt l 1; } else { cpu = elemAt l 0; kernel = elemAt l 1; }; "3" = # Awkwards hacks, beware! if elemAt l 1 == "apple" diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 3dec10ad0dbf..755297264625 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -144,6 +144,8 @@ in arm-embedded = mapTestOnCross lib.systems.examples.arm-embedded embedded; powerpc-embedded = mapTestOnCross lib.systems.examples.powerpc-embedded embedded; aarch64-embedded = mapTestOnCross lib.systems.examples.aarch64-embedded embedded; + i686-embedded = mapTestOnCross lib.systems.examples.i686-embedded embedded; + x86_64-embedded = mapTestOnCross lib.systems.examples.x86_64-embedded embedded; /* Cross-built bootstrap tools for every supported platform */ bootstrapTools = let |