Skip to content

llvmPackages.compiler-rt: drop libc-free patch #380213

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

Merged
merged 1 commit into from
Feb 8, 2025

Conversation

RossComputerGuy
Copy link
Member

Things done

Since llvm/llvm-project#125922 was closed, let's drop the patch. Also unbreaks llvmPackages_git.compiler-rt from eval.

CC @peterwaller-arm

  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@github-actions github-actions bot added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label Feb 7, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Feb 7, 2025
@peterwaller-arm
Copy link
Contributor

peterwaller-arm commented Feb 8, 2025

Since llvm/llvm-project#125922 was closed, let's drop the patch. Also unbreaks llvmPackages_git.compiler-rt from eval.

If you're referring to the eval breakage; I think it's because the patch applies to both _20 and _git, but the patch only exists in the _20 directory, so _git is broken.

The patch remains necessary for nixpkgs to build useLLVM packages on aarch64, for now. I closed llvm/llvm-project#125922 because it may not be the right approach for LLVM, or it needs more momentum behind it. The question we'd need to answer is if the nixpkgs side really needs a libc-free compiler-rt or if we can instead provide the libc headers to the compiler-rt builtins build.

@zowoq
Copy link
Contributor

zowoq commented Feb 8, 2025

Merging this to fix the eval breakage as I there isn't a simple workaround like there was last time.

@zowoq zowoq merged commit 5f5cb66 into NixOS:master Feb 8, 2025
27 checks passed
@RossComputerGuy RossComputerGuy deleted the feat/llvm-nits branch February 8, 2025 14:40
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: 11-100 This PR causes between 11 and 100 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
Development

Successfully merging this pull request may close these issues.

4 participants