diff options
author | Moritz Angermann <moritz.angermann@gmail.com> | 2019-08-23 18:53:22 +0200 |
---|---|---|
committer | John Ericson <git@JohnEricson.me> | 2019-09-02 01:27:05 -0400 |
commit | 446f8c851d599326373a2c910841d092ff8e68ae (patch) | |
tree | 2fa26cf138d9f71c2b593274600f2a70016392f9 /lib/systems | |
parent | 280795c163ba70d6d0c0c0fc2e87ce4c8801dbac (diff) |
Add support for `js-unknown-ghcjs`
This adds enough logic to nixpkgs to support the `js-unknown-ghcjs` triple.
Diffstat (limited to 'lib/systems')
-rw-r--r-- | lib/systems/examples.nix | 12 | ||||
-rw-r--r-- | lib/systems/inspect.nix | 2 | ||||
-rw-r--r-- | lib/systems/parse.nix | 7 |
3 files changed, 17 insertions, 4 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index ac1633a1a15f..90068f566ed0 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -119,7 +119,7 @@ rec { config = "aarch64-none-elf"; libc = "newlib"; }; - + aarch64be-embedded = { config = "aarch64_be-none-elf"; libc = "newlib"; @@ -129,12 +129,12 @@ rec { config = "powerpc-none-eabi"; libc = "newlib"; }; - + ppcle-embedded = { config = "powerpcle-none-eabi"; libc = "newlib"; }; - + alpha-embedded = { config = "alpha-elf"; libc = "newlib"; @@ -212,4 +212,10 @@ rec { libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; + + # Ghcjs + ghcjs = { + config = "js-unknown-ghcjs"; + platform = {}; + }; } diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index e35e7b4a1ec7..bf186126d4a9 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -49,6 +49,8 @@ rec { isEfi = map (family: { cpu.family = family; }) [ "x86" "arm" "aarch64" ]; + isJavaScript = { cpu = cpuTypes.js; }; + isGhcjs = { kernel = kernels.ghcjs; }; # Deprecated after 18.03 isArm = isAarch32; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 6947d41419e3..a20b334311ef 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -106,10 +106,12 @@ rec { wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; }; wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; }; - + alpha = { bits = 64; significantByte = littleEndian; family = "alpha"; }; avr = { bits = 8; family = "avr"; }; + + js = { bits = 32; significantByte = littleEndian; family = "js"; }; }; ################################################################################ @@ -188,6 +190,7 @@ rec { openbsd = { execFormat = elf; families = { inherit bsd; }; }; solaris = { execFormat = elf; families = { }; }; windows = { execFormat = pe; families = { }; }; + ghcjs = { execFormat = unknown; families = { }; }; } // { # aliases # 'darwin' is the kernel for all of them. We choose macOS by default. darwin = kernels.macos; @@ -299,6 +302,8 @@ rec { then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; } else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"]) then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 1; abi = elemAt l 2; } + else if (elemAt l 2 == "ghcjs") + then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 2; } else throw "Target specification with 3 components is ambiguous"; "4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; }; }.${toString (length l)} |