Skip to content

pkgs/development/compilers/llvm: add replacement entrypoint using mak… #436350

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.

Sign up for GitHub

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

Closed
RossComputerGuy wants to merge 2 commits into from
Closed

pkgs/development/compilers/llvm: add replacement entrypoint using mak… #436350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c364b93
pkgs/development/compilers/llvm: add replacement entrypoint using mak…
RossComputerGuy Aug 24, 2025
acd183d
llvmPackages_13.compiler-rt: fix missing libcxx source
RossComputerGuy Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkgs/development/compilers/llvm/common/compiler-rt/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString (lib.versionAtLeast release_version "14") ''
cp -r ${monorepoSrc}/cmake "$out"
''
# Needs "libcxx/utils/merge_archives.py"
+ lib.optionalString (lib.versions.major release_version == "13") ''
cp -r ${monorepoSrc}/libcxx "$out"
''
Comment on lines +65 to +68
Copy link
Copy Markdown
Member

@emilazy emilazy Sep 1, 2025

Choose a reason for hiding this comment

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

Was this previously being injected by override or something? I’m not seeing it in this PR.

I’m dropping LLVM 12–17 this week, so I don’t think we need to spend time fixing existing issues with LLVM 13 (and it goes against making this zero rebuilds).

Copy link
Copy Markdown
Member Author

@RossComputerGuy RossComputerGuy Sep 1, 2025

Choose a reason for hiding this comment

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

I'm not sure, that's what confused me.

Copy link
Copy Markdown
Member Author

@RossComputerGuy RossComputerGuy Sep 1, 2025

Choose a reason for hiding this comment

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

Oh, now I know what it is. llvmPackages.compiler-rt.src was literally the entire Git repo shoved in and not this special one we generate here.

+ lib.optionalString (lib.versionAtLeast release_version "21") ''
cp -r ${monorepoSrc}/third-party "$out"
''
Expand Down
Loading
Loading