diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-01-29 21:01:24 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-23 21:48:57 -0400 |
commit | 9abff4af4f07c16aecd89bf82051afbc3228d6fd (patch) | |
tree | 7a8d8fe316db1636819a43a28192da740ea835c8 /pkgs/test | |
parent | 6088a4793f2a83921b197a9185034934fcd96d02 (diff) | |
download | nixpkgs-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar nixpkgs-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar.gz nixpkgs-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar.bz2 nixpkgs-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar.lz nixpkgs-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar.xz nixpkgs-9abff4af4f07c16aecd89bf82051afbc3228d6fd.tar.zst nixpkgs-9abff4af4f07c16aecd89bf82051afbc3228d6fd.zip |
wasm: init cross target
Adds pkgsCross.wasm32 and pkgsCross.wasm64. Use it to build Nixpkgs with a WebAssembly toolchain. stdenv/cross: use static overlay on isWasm isWasm doesn’t make sense dynamically linked.
Diffstat (limited to 'pkgs/test')
-rw-r--r-- | pkgs/test/cross/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index 5d9c120c501..6c31a16f2fd 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -93,8 +93,7 @@ let }; -in (lib.mapAttrs (_: mapMultiPlatformTest builtins.id) tests) -// (lib.mapAttrs' (name: test: { - name = "${name}-llvm"; - value = mapMultiPlatformTest (system: system // {useLLVM = true;}) test; - }) tests) +in { + gcc = (lib.mapAttrs (_: mapMultiPlatformTest (system: system // {useLLVM = false;})) tests); + llvm = (lib.mapAttrs (_: mapMultiPlatformTest (system: system // {useLLVM = true;})) tests); +} |