Skip to content

[staging-next] rustc: disable wasm32 if some gcc options are set#318447

Merged
vcunat merged 1 commit intoNixOS:staging-nextfrom
alyssais:rustc-wasm32
Jun 9, 2024
Merged

[staging-next] rustc: disable wasm32 if some gcc options are set#318447
vcunat merged 1 commit intoNixOS:staging-nextfrom
alyssais:rustc-wasm32

Conversation

@alyssais
Copy link
Member

@alyssais alyssais commented Jun 9, 2024

Description of changes

(Sorry this took so long.)

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.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@alyssais alyssais requested a review from vcunat June 9, 2024 06:15
@alyssais alyssais changed the title rustc: disable wasm32 if some gcc options are set [staging-next] rustc: disable wasm32 if some gcc options are set Jun 9, 2024
@github-actions github-actions bot added the 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. label Jun 9, 2024
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.
@vcunat vcunat merged commit b45d725 into NixOS:staging-next Jun 9, 2024
@vcunat
Copy link
Member

vcunat commented Jun 9, 2024

If I looked right, out of the four main platforms only aarch64-darwin is rebuilt and this fixes the build there for me.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/is-there-a-way-to-install-a-macos-pkg-from-an-url/49660/8

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants