Skip to content

llvmPackages: clean up rebuild avoidance - #447071

Merged
alyssais merged 8 commits into
NixOS:stagingfrom
LunNova:push-lxxxmkoznort
Sep 30, 2025
Merged

llvmPackages: clean up rebuild avoidance#447071
alyssais merged 8 commits into
NixOS:stagingfrom
LunNova:push-lxxxmkoznort

Conversation

@LunNova

@LunNova LunNova commented Sep 29, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

Rebuild avoidance cleanup for llvmPackages TODOs from #440273 (@emilazy's big obsolete LLVM version drop PR) and #446207 (my enableClangToolsExtra PR)

I hope #442017 lands so there's not a need to worry about rebuilds from cmakeFlags ordering in the future.

Things done

  • Built on platform:
    • x86_64-linux
      • .#llvmPackages_{git,19}.lib{clang,llvm}{.tests.withoutOptionalFeatures,} .#llvmPackages_{git,19}.{lldb,lld,libunwind,openmp,libcxx,bolt,clangNoCompilerRtWithLibc}
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related labels Sep 29, 2025
LunNova
LunNova commented Sep 29, 2025
View reviewed changes
Comment thread pkgs/development/compilers/llvm/common/clang/default.nix
Comment on lines +105 to +107
++ lib.optional (lib.versionAtLeast release_version "20") (
lib.cmakeFeature "LLVM_DIR" "${libllvm.dev}/lib/cmake/llvm"
)

@LunNova LunNova Sep 29, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I sorted LLVM_DIR up to here so that when llvm 19 is dropped it will already be in the right place instead of left in an unconditional ++ [ … ] at the bottom.

@LunNova
LunNova marked this pull request as ready for review September 29, 2025 05:51
alyssais
alyssais reviewed Sep 29, 2025
View reviewed changes

@alyssais alyssais left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this!

Comment thread pkgs/development/compilers/llvm/common/clang/default.nix Outdated
@LunNova
LunNova requested a review from alyssais September 30, 2025 15:25
@alyssais
alyssais merged commit 10a4dec into NixOS:staging Sep 30, 2025
27 of 31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314
@dtzWill dtzWill Awaiting requested review from dtzWill
@rrbutani rrbutani Awaiting requested review from rrbutani
@lovek323 lovek323 Awaiting requested review from lovek323
@emilazy emilazy Awaiting requested review from emilazy
@sternenseemann sternenseemann Awaiting requested review from sternenseemann
@RossComputerGuy RossComputerGuy Awaiting requested review from RossComputerGuy
@alyssais alyssais Awaiting requested review from alyssais

Assignees

No one assigned

Labels

6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@LunNova @alyssais