Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

llvm musl changes #191372

Merged
merged 2 commits into from
Sep 20, 2022
Merged

Conversation

yu-re-ka
Copy link
Contributor

@yu-re-ka yu-re-ka commented Sep 15, 2022

Description of changes

Musl-specific changes to llvm, that fix some crashes.
For linking some heavier applications (like Firefox) the stack size needs to be increased.
Also some static compiler-runtime libraries are disabled, but are needed for Firefox.
In preparation for #191060 I would like to merge these small changes first, they will also be useful for other bigger applications in pkgsMusl.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@yu-re-ka
Copy link
Contributor Author

I guess this change also leads to a derivation change of llvmPackages_14.lld and thus a few rebuilds:

+  LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152";

When the optionalString condition does to match, it produces a LDFLAGS="";, which is not the same as not having the attribute.

@yu-re-ka yu-re-ka merged commit 6485a02 into NixOS:master Sep 20, 2022
@yu-re-ka yu-re-ka deleted the musl-firefox-toolchain-preparation branch September 20, 2022 06:04
@rrbutani rrbutani mentioned this pull request Nov 7, 2022
92 tasks
ElvishJerricco pushed a commit to ElvishJerricco/nixpkgs that referenced this pull request Jan 8, 2023
github-actions bot pushed a commit that referenced this pull request Jan 28, 2023
K900 pushed a commit that referenced this pull request Jan 28, 2023
@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants