llvmPackages_git.compiler-rt: fix build

[alyssais]

Description of changes

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:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• 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/)
• 23.05 Release Notes (or backporting 22.11 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.

[sternenseemann]

@ofborg build llvmPackages_git.compiler-rt

[rrbutani]

I've been meaning to redo llvmPackages_git starting from llvmPackages_15 once some of the remaining llvmPackages_15 PRs go through (llvmPackages_git is missing a fair number of patches at this point I think) but merging this fix in the interim certainly doesn't hurt!

---

I'm a little unsure whether it makes sense to share the armv7l compiler-rt patch between llvmPackages_15 and _git (it seems like the two files it touches see a fair bit of churn and I imagine _git will end up needing it's own version of the patch again once we update it) but this doesn't hurt either; at worst 15's version of the patch just ends up living in common.

[alyssais]

I'm a little unsure whether it makes sense to share the armv7l compiler-rt patch between llvmPackages_15 and _git (it seems like the two files it touches see a fair bit of churn and I imagine _git will end up needing it's own version of the patch again once we update it) but this doesn't hurt either; at worst 15's version of the patch just ends up living in common.

Yeah I wasn't sure either, but I decided it's best to avoid having two copies of the patch just in case one has to change later.

[alyssais]

I've been meaning to redo llvmPackages_git starting from llvmPackages_15 once some of the remaining llvmPackages_15 PRs go through (llvmPackages_git is missing a fair number of patches at this point I think) but merging this fix in the interim certainly doesn't hurt!

I might beat you to it. :) I'm trying to copy all the changes that were made to llvmPackages_15 over to _git — I didn't want to end up with a single blob of changes that were difficult to understand. In future, it would probably make things easier to always make sure changes are added to _git at the same time as the latest LLVM. (And in the further future, to have a common builder function…)

[rrbutani]

I might beat you to it. :) I'm trying to copy all the changes that were made to llvmPackages_15 over to _git — I didn't want to end up with a single blob of changes that were difficult to understand.

Sounds good! 🙂

Locally I've got llvmPackages_git updated to LLVM 16.0.0RC1 but not yet working (still working through build errors..); I don't think I'll have time to get it ready at least the weekend anyways but regardless, I'll hold off on opening a PR until llvmPackages_git is caught up.

In future, it would probably make things easier to always make sure changes are added to _git at the same time as the latest LLVM.

Definitely; I kind of gave up on it in the llvmPackages_15 PR because _git was already pretty far gone at that point but I totally see the value in _git having a comprehensive commit history.

---

Please let me know if I can help in any way! Between the changes in #194634 and all the other PRs listed there I think there's lots that llvmPackages_git is missing.

[alyssais]

Please let me know if I can help in any way! Between the changes in #194634 and all the other PRs listed there I think there's lots that llvmPackages_git is missing.

Thanks! Are you on Matrix? (I checked maintainer-list.nix and didn't see a Matrix ID for you.) It'd be great to have you in the Compilers Team channel, if you're not there already.

[rrbutani]

It'd be great to have you in the Compilers Team channel, if you're not there already.

Thanks! I just joined the channel