git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67920 from Ericson2314/feature/js-unknown-ghcjs

Add support for `js-unknown-ghcjs`

commitd2d107c4de7f5b36eb82e6884a90c144e9014e5a authorJohn Ericson <git@JohnEricson.me> dateMon 2 Sep 2019, 01:52 (7 years ago) parent2baa9e7f57fe63
5 files changed+17−2
lib/systems/examples.nix+5 lib/systems/inspect.nix+3−1 lib/systems/parse.nix+6−1 pkgs/stdenv/cross/default.nix+2 pkgs/top-level/all-packages.nix+1
lib/systems/examples.nix+5
@@ -236,4 +236,9 @@ rec {
236236 useLLVM = true;
237237 };
238238
239+ # Ghcjs
240+ ghcjs = {
241+ config = "js-unknown-ghcjs";
242+ platform = {};
243+ };
239244}
lib/systems/inspect.nix+3−1
@@ -12,7 +12,7 @@ rec {
1212 isx86_32 = { cpu = { family = "x86"; bits = 32; }; };
1313 isx86_64 = { cpu = { family = "x86"; bits = 64; }; };
1414 isPowerPC = { cpu = cpuTypes.powerpc; };
15− isPower = { cpu = { family = "power"; }; };
15+ isPower = { cpu = { family = "power"; }; };
1616 isx86 = { cpu = { family = "x86"; }; };
1717 isAarch32 = { cpu = { family = "arm"; bits = 32; }; };
1818 isAarch64 = { cpu = { family = "arm"; bits = 64; }; };
@@ -23,6 +23,7 @@ rec {
2323 isMsp430 = { cpu = { family = "msp430"; }; };
2424 isAvr = { cpu = { family = "avr"; }; };
2525 isAlpha = { cpu = { family = "alpha"; }; };
26+ isJavaScript = { cpu = cpuTypes.js; };
2627
2728 is32bit = { cpu = { bits = 32; }; };
2829 is64bit = { cpu = { bits = 64; }; };
@@ -45,6 +46,7 @@ rec {
4546 isMinGW = { kernel = kernels.windows; abi = abis.gnu; };
4647 isWasi = { kernel = kernels.wasi; };
4748 isNone = { kernel = kernels.none; };
49+ isGhcjs = { kernel = kernels.ghcjs; };
4850
4951 isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ];
5052 isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
lib/systems/parse.nix+6−1
@@ -106,11 +106,13 @@ rec {
106106
107107 wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; };
108108 wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; };
109−
109+
110110 alpha = { bits = 64; significantByte = littleEndian; family = "alpha"; };
111111
112112 msp430 = { bits = 16; significantByte = littleEndian; family = "msp430"; };
113113 avr = { bits = 8; family = "avr"; };
114+
115+ js = { bits = 32; significantByte = littleEndian; family = "js"; };
114116 };
115117
116118 # Determine where two CPUs are compatible with each other. That is,
@@ -271,6 +273,7 @@ rec {
271273 solaris = { execFormat = elf; families = { }; };
272274 wasi = { execFormat = wasm; families = { }; };
273275 windows = { execFormat = pe; families = { }; };
276+ ghcjs = { execFormat = unknown; families = { }; };
274277 } // { # aliases
275278 # 'darwin' is the kernel for all of them. We choose macOS by default.
276279 darwin = kernels.macos;
@@ -384,6 +387,8 @@ rec {
384387 then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
385388 else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])
386389 then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 1; abi = elemAt l 2; }
390+ else if (elemAt l 2 == "ghcjs")
391+ then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 2; }
387392 else throw "Target specification with 3 components is ambiguous";
388393 "4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
389394 }.${toString (length l)}
pkgs/stdenv/cross/default.nix+2
@@ -55,6 +55,8 @@ in lib.init bootStages ++ [
5555 then buildPackages.darwin.iosSdkPkgs.clang
5656 else if crossSystem.useAndroidPrebuilt or false
5757 then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".clang
58+ else if targetPlatform.isGhcjs
59+ then null
5860 else if crossSystem.useLLVM or false
5961 then buildPackages.llvmPackages_8.lldClang
6062 else buildPackages.gcc;
pkgs/top-level/all-packages.nix+1
@@ -10973,6 +10973,7 @@ in
1097310973 else if name == "libSystem" then targetPackages.darwin.xcode
1097410974 else if name == "nblibc" then targetPackages.netbsdCross.libc
1097510975 else if name == "wasilibc" then targetPackages.wasilibc or wasilibc
10976+ else if stdenv.targetPlatform.isGhcjs then null
1097610977 else throw "Unknown libc ${name}";
1097710978
1097810979 libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc;