Skip to content
Snippets Groups Projects
Commit 854fc8e4 authored by Sven Tennie's avatar Sven Tennie :smiley_cat:
Browse files

Merge branch 'supersven/i686-cross' into 'main'

Add cross config for i686 (Intel 32bit)

See merge request !31
parents aecea292 a9326d52
No related branches found
No related tags found
1 merge request!31Add cross config for i686 (Intel 32bit)
Pipeline #109955 passed
......@@ -87,6 +87,7 @@ smoke-test-cross:
- js-cross
- riscv64-linux-cross
- aarch64-linux-cross
- i686-linux-cross
# PPC64 builds its entire world, because fundamental dependencies are
# missing in cache.nixos.org. This takes too long for our purposes.
# - ppc64-linux-cross
......@@ -111,6 +112,7 @@ verify-cross:
- CONF: '{ "target": "js-cross", "emulator": "", "args": "--bignum=native"}'
- CONF: '{ "target": "riscv64-linux-cross", "emulator": "qemu-riscv64", "args": ""}'
- CONF: '{ "target": "aarch64-linux-cross", "emulator": "qemu-aarch64", "args": ""}'
- CONF: '{ "target": "i686-linux-cross", "emulator": "qemu-i386", "args": ""}'
# PPC64 builds its entire world, because fundamental dependencies are
# missing in cache.nixos.org. This takes too long for our purposes.
# - CONF: '{ "target": "ppc64-linux-cross", "emulator": "qemu-ppc64", "args": ""}'
......
......@@ -107,6 +107,12 @@
crossTarget = "powerpc64-unknown-linux-gnuabielfv2";
withQemu = true;
});
# 32bit Intel
i686-linux-cross = import ./ghc.nix (defaultSettings system // userSettings
// {
crossTarget = "i686-unknown-linux-gnu";
withQemu = true;
});
formatting = nixpkgs.legacyPackages.${system}.mkShell {
inherit (pre-commit-check system) shellHook;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment