[Backport release-25.05] llvmPackages_21: 21.1.0-rc1 -> 21.1.0-rc2

[mdaniels5757]

Manual backport of #429385 and afd9652 to release-25.05.

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

[RossComputerGuy]

afd9652 fixes LLVM libc

[github-actions]

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.

If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Difference between d3f3019 and original afd9652 may warrant inspection.

Show diff

@@ Metadata
  ## Commit message ##
     llvmPackages_21.libc: fix building
 
+    (cherry picked from commit afd965280e1f52dace0327474b6176f23e8c386f)
+
  ## pkgs/development/compilers/llvm/common/libc/default.nix ##
 @@
  let
    pname = "libc";
  
--  src' = runCommand "${pname}-src-${version}" { } (''
+-  src' = runCommand "${pname}-src-${version}" { } ''
 -    mkdir -p "$out"
 -    cp -r ${monorepoSrc}/cmake "$out"
 -    cp -r ${monorepoSrc}/runtimes "$out"
 -    cp -r ${monorepoSrc}/llvm "$out"
 -    cp -r ${monorepoSrc}/compiler-rt "$out"
 -    cp -r ${monorepoSrc}/${pname} "$out"
--  '');
+-  '';
 +  src' = runCommand "${pname}-src-${version}" { } (
 +    ''
 +      mkdir -p "$out"

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

[mdaniels5757]

Thanks, added to the backport.

[mdaniels5757]

The cherry-pick failure is due to #448813.

[mdaniels5757]

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 448660
Commit: d3f30193f1b757e54a95ef08c28bc702e3e190c7

---

aarch64-linux

✅ 52 packages built:

• bolt_21 (llvmPackages_21.bolt)
• bolt_21.dev (llvmPackages_21.bolt.dev)
• clang_21 (llvmPackages_21.clang, llvmPackages_21.libstdcxxClang)
• lld_21 (llvmPackages_21.lld)
• lld_21.dev (llvmPackages_21.lld.dev)
• lld_21.lib (llvmPackages_21.lld.lib)
• lldb_21 (llvmPackages_21.lldb)
• lldb_21.dev (llvmPackages_21.lldb.dev)
• llvmPackages_21.bintools
• llvmPackages_21.bintools-unwrapped
• llvmPackages_21.bintoolsNoLibc
• llvmPackages_21.clang-manpages
• llvmPackages_21.clang-tools
• llvmPackages_21.libclang (llvmPackages_21.clang-unwrapped)
• llvmPackages_21.libclang.dev (llvmPackages_21.clang-unwrapped.dev)
• llvmPackages_21.libclang.lib (llvmPackages_21.clang-unwrapped.lib)
• llvmPackages_21.libclang.python (llvmPackages_21.clang-unwrapped.python)
• llvmPackages_21.clangNoLibcNoRt (llvmPackages_21.clangNoCompilerRt)
• llvmPackages_21.clangNoCompilerRtWithLibc
• llvmPackages_21.clangNoLibc (llvmPackages_21.clangNoLibcWithBasicRt)
• llvmPackages_21.clangNoLibcxx (llvmPackages_21.clangWithLibcAndBasicRt)
• llvmPackages_21.clangUseLLVM
• llvmPackages_21.clangWithLibcAndBasicRtAndLibcxx
• llvmPackages_21.compiler-rt (llvmPackages_21.compiler-rt-libc)
• llvmPackages_21.compiler-rt.dev (llvmPackages_21.compiler-rt-libc.dev)
• llvmPackages_21.compiler-rt-no-libc
• llvmPackages_21.compiler-rt-no-libc.dev
• llvmPackages_21.libc (llvmPackages_21.libc-overlay)
• llvmPackages_21.libc-full
• llvmPackages_21.libc-full.dev
• llvmPackages_21.libcxx
• llvmPackages_21.libcxx.dev
• llvmPackages_21.libcxxClang
• llvmPackages_21.libcxxStdenv
• llvm_21 (llvmPackages_21.llvm)
• llvm_21.dev (llvmPackages_21.llvm.dev)
• llvm_21.lib (llvmPackages_21.llvm.lib)
• llvm_21.python (llvmPackages_21.llvm.python)
• llvmPackages_21.libunwind
• llvmPackages_21.libunwind.dev
• llvmPackages_21.lldb-manpages
• llvmPackages_21.lldbPlugins.llef
• llvmPackages_21.llvm-manpages
• llvmPackages_21.mlir
• llvmPackages_21.mlir.dev
• llvmPackages_21.openmp
• llvmPackages_21.openmp.dev
• llvmPackages_21.stdenv
• llvmPackages_21.tblgen
• tests.cc-wrapper.llvmTests.llvmPackages_21.clang
• tests.cc-wrapper.llvmTests.llvmPackages_21.libcxx
• tests.cc-wrapper.supported

[alyssais]

This hunk isn't in the original commit. Does that mean there's another commit we should have backported but didn't?

[RossComputerGuy]

Probably a771797

[mdaniels5757]

It's in afd9652, no?

[RossComputerGuy]

Well, that commit comes from the same PR as the commit I just mentioned. Both are from #437137.

[mdaniels5757]

Wait I missed that #442866 contains this update, and a couple more. This PR should be closed, I think; I'll request the libc-fixing commit be cherry-picked there.