diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-25 14:11:18 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-25 14:11:18 +0000 |
| commit | 80524db331e6dbd75aaba12f7097a6be269ac7c6 (patch) | |
| tree | 4ee3018967ccfa29526f38bebeadb693645800af | |
| parent | 6bc456c91c6a556e905852d9a13034ed1932ea3d (diff) | |
| parent | 765d2608b694e425743b8030570ea8c99e167558 (diff) | |
Merge branch 'ghcjs-cross-without-cc-19.09' into ghcjs-cross-without-cc
| -rw-r--r-- | lib/systems/doubles.nix | 1 | ||||
| -rw-r--r-- | lib/tests/systems.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 59bb095a28f5..96e602d0e167 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -48,6 +48,7 @@ in { mips = filterDoubles predicates.isMips; riscv = filterDoubles predicates.isRiscV; vc4 = filterDoubles predicates.isVc4; + js = filterDoubles predicates.isJavaScript; cygwin = filterDoubles predicates.isCygwin; darwin = filterDoubles predicates.isDarwin; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 818749442f9f..6f52912994df 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -12,7 +12,7 @@ let expected = lib.sort lib.lessThan y; }; in with lib.systems.doubles; lib.runTests { - testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded); + testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ js); testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ]; testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ]; |