Skip to content

llvm musl changes#191372

Merged
yu-re-ka merged 2 commits intoNixOS:masterfrom
yu-re-ka:musl-firefox-toolchain-preparation
Sep 20, 2022
Merged

llvm musl changes#191372
yu-re-ka merged 2 commits intoNixOS:masterfrom
yu-re-ka:musl-firefox-toolchain-preparation

Conversation

@yu-re-ka
Copy link
Contributor

@yu-re-ka yu-re-ka commented Sep 15, 2022 •
edited
Loading

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.

@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Sep 15, 2022
@yu-re-ka
Copy link
Contributor Author

yu-re-ka commented Sep 15, 2022

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
Merged
92 tasks
rrbutani added a commit to rrbutani/nixpkgs that referenced this pull request Jan 8, 2023
@rrbutani
llvmPackages_15: apply some patches from llvmPackages_14
8c4b8b5 
See NixOS#194634 for details.

PRs:
  - NixOS#191372
  - NixOS#190936
  - NixOS#82131
  - NixOS#199844
  - NixOS#197674
  - NixOS#184408
  - NixOS#193004
ElvishJerricco pushed a commit to ElvishJerricco/nixpkgs that referenced this pull request Jan 8, 2023
@rrbutani @ElvishJerricco
llvmPackages_15: apply some patches from llvmPackages_14
f3377f0 
See NixOS#194634 for details.

PRs:
  - NixOS#191372
  - NixOS#190936
  - NixOS#82131
  - NixOS#199844
  - NixOS#197674
  - NixOS#184408
  - NixOS#193004
rrbutani added a commit to rrbutani/nixpkgs that referenced this pull request Jan 10, 2023
@rrbutani
llvmPackages_15: apply some patches from llvmPackages_14
589713c 
See NixOS#194634 for details.

PRs:
  - NixOS#191372
  - NixOS#190936
  - NixOS#82131
  - NixOS#199844
  - NixOS#197674
  - NixOS#184408
  - NixOS#193004
rrbutani added a commit to rrbutani/nixpkgs that referenced this pull request Jan 27, 2023
@rrbutani
llvmPackages_15: apply some patches from llvmPackages_14
81ef82a 
See NixOS#194634 for details.

PRs:
  - NixOS#191372
  - NixOS#190936
  - NixOS#82131
  - NixOS#199844
  - NixOS#197674
  - NixOS#184408
  - NixOS#193004
github-actions bot pushed a commit that referenced this pull request Jan 28, 2023
@rrbutani @github-actions
llvmPackages_15: apply some patches from llvmPackages_14
4fb7083 
See #194634 for details.

PRs:
  - #191372
  - #190936
  - #82131
  - #199844
  - #197674
  - #184408
  - #193004
(cherry picked from commit 81ef82a)
K900 pushed a commit that referenced this pull request Jan 28, 2023
@rrbutani @K900
llvmPackages_15: apply some patches from llvmPackages_14
87e4857 
See #194634 for details.

PRs:
  - #191372
  - #190936
  - #82131
  - #199844
  - #197674
  - #184408
  - #193004
xanderio pushed a commit to xanderio/nixpkgs that referenced this pull request Feb 13, 2023
@rrbutani @xanderio
llvmPackages_15: apply some patches from llvmPackages_14
871ab8d 
See NixOS#194634 for details.

PRs:
  - NixOS#191372
  - NixOS#190936
  - NixOS#82131
  - NixOS#199844
  - NixOS#197674
  - NixOS#184408
  - NixOS#193004
@yu-re-ka yu-re-ka mentioned this pull request Feb 19, 2023
Merged
12 tasks
@alyssais alyssais mentioned this pull request Feb 27, 2023
Merged
12 tasks
@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

Reviewers

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@lovek323 lovek323 Awaiting requested review from lovek323

@primeos primeos Awaiting requested review from primeos

@dtzWill dtzWill Awaiting requested review from dtzWill

Assignees

No one assigned

Labels

6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@yu-re-ka @rrbutani @yuyuyureka