Skip to content

[Backport release-23.11] llvmPackages: Deduping#272881

Merged
wegank merged 6 commits intorelease-23.11from
backport-268812-to-release-23.11
Dec 8, 2023
Merged

[Backport release-23.11] llvmPackages: Deduping#272881
wegank merged 6 commits intorelease-23.11from
backport-268812-to-release-23.11

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Dec 8, 2023

Bot-based backport to release-23.11, triggered by a label in #268812.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

(cherry picked from commit 2902f99)
(cherry picked from commit 5ac86a9)
(cherry picked from commit e675189)
Doing the same thing as was done in the initial adding of `monorepoSrc` to `llvmPackages_15` d231d18

(cherry picked from commit c1e1a58)
for hygiene

Run `deadnix . --edit`

`gccForLibs` is an argument used by multi.nix but it's an argument to
cc-wrapper, not to llvmPackages.

`@args` in `llvm/default.nix` was accidentally added in 4badff4

There are no uses of `@` therefore these changes are safe.

(cherry picked from commit b59fd20)
Removing this caused

`error: anonymous function at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/ofborg-evaluator-2/pkgs/development/compilers/llvm/11/compiler-rt/default.nix:1:1 called with unexpected argument 'libcxxabi'`

https://github.com/search?q=repo%3ANixOS%2Fnixpkgs%20%2Fcompiler-rt.override%2F&type=code

The argument became unused in 56fcbcd#diff-b1bb77941db4393b7d2cf7a370cee294318418f2507b7a78e22353d1afbb6d21L18

but it was not removed from `buildInputs` in later `llvmPackages` because `llvmPackages_12` had
been created before this change was done.

Removing `libcxxabi` from `buildInputs` may have to be applied to the
other `llvmPackages` too.

(cherry picked from commit f6749cd)
@github-actions github-actions bot mentioned this pull request Dec 8, 2023
13 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Dec 8, 2023
@wegank wegank merged commit 357f220 into release-23.11 Dec 8, 2023
@wegank wegank deleted the backport-268812-to-release-23.11 branch December 8, 2023 13:29
@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: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants