diff options
author | John Ericson <git@JohnEricson.me> | 2019-09-02 01:52:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-02 01:52:25 -0400 |
commit | d2d107c4de7f5b36eb82e6884a90c144e9014e5a (patch) | |
tree | 6f45003cf933b3f1417a22cbcf3ca9afcf583737 /lib/systems | |
parent | 2baa9e74c47bcf9df12e3caaa5dd11995b02ba64 (diff) | |
parent | f57fe63d5fe7bdd434bfe172370d49eddf666a5e (diff) |
Merge pull request #67920 from Ericson2314/feature/js-unknown-ghcjs
Add support for `js-unknown-ghcjs`
Diffstat (limited to 'lib/systems')
-rw-r--r-- | lib/systems/examples.nix | 5 | ||||
-rw-r--r-- | lib/systems/inspect.nix | 4 | ||||
-rw-r--r-- | lib/systems/parse.nix | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index aa55438de082..4861fe634a02 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -236,4 +236,9 @@ rec { useLLVM = true; }; + # Ghcjs + ghcjs = { + config = "js-unknown-ghcjs"; + platform = {}; + }; } diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 9a12e3c3926d..51effb7d1572 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -12,7 +12,7 @@ rec { isx86_32 = { cpu = { family = "x86"; bits = 32; }; }; isx86_64 = { cpu = { family = "x86"; bits = 64; }; }; isPowerPC = { cpu = cpuTypes.powerpc; }; - isPower = { cpu = { family = "power"; }; }; + isPower = { cpu = { family = "power"; }; }; isx86 = { cpu = { family = "x86"; }; }; isAarch32 = { cpu = { family = "arm"; bits = 32; }; }; isAarch64 = { cpu = { family = "arm"; bits = 64; }; }; @@ -23,6 +23,7 @@ rec { isMsp430 = { cpu = { family = "msp430"; }; }; isAvr = { cpu = { family = "avr"; }; }; isAlpha = { cpu = { family = "alpha"; }; }; + isJavaScript = { cpu = cpuTypes.js; }; is32bit = { cpu = { bits = 32; }; }; is64bit = { cpu = { bits = 64; }; }; @@ -45,6 +46,7 @@ rec { isMinGW = { kernel = kernels.windows; abi = abis.gnu; }; isWasi = { kernel = kernels.wasi; }; isNone = { kernel = kernels.none; }; + isGhcjs = { kernel = kernels.ghcjs; }; isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index b088cd342f12..0c42689a9b13 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -106,11 +106,13 @@ rec { wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; }; wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; }; - + alpha = { bits = 64; significantByte = littleEndian; family = "alpha"; }; msp430 = { bits = 16; significantByte = littleEndian; family = "msp430"; }; avr = { bits = 8; family = "avr"; }; + + js = { bits = 32; significantByte = littleEndian; family = "js"; }; }; # Determine where two CPUs are compatible with each other. That is, @@ -271,6 +273,7 @@ rec { solaris = { execFormat = elf; families = { }; }; wasi = { execFormat = wasm; 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; @@ -384,6 +387,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)} |