diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-06-09 07:10:51 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-06-09 07:20:18 +0100 |
commit | bf13eca852acddd5e44b5ad9b4ebc0629d612737 (patch) | |
tree | 6afcbf83eb66d754d43ac794a1fc502d9cfd45f7 /pkgs/by-name/re | |
parent | ddc356c1f074bf2d5c86e890185e6854205252dd (diff) |
rustc: disable wasm32 if some gcc options are set
This is a temporary fix to get rustc building again with these configurations (which notably include the default aarch64-darwin one) without causing a stdenv rebuild. The real fix will be to avoid passing these options through the Clang wrapper when the target is overridden. It could be that there are packages that need wasm32-unknown-unknown beyond those I've marked as broken here — it's impossible to be sure without a full rebuild. But this should be most of them.
Diffstat (limited to 'pkgs/by-name/re')
-rw-r--r-- | pkgs/by-name/re/rerun/package.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 4d9c8da8041c0..6fedb10cfed12 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -126,5 +126,8 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with maintainers; [ SomeoneSerge ]; mainProgram = "rerun"; + # See comment about wasm32-unknown-unknown in rustc.nix. + broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || + !stdenv.hostPlatform.gcc.thumb or true; }; } |