Skip to content

stdenv: fix eval for native LLVM #463361

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

Open
RossComputerGuy wants to merge 2 commits into
base: staging
Choose a base branch
from
Open

stdenv: fix eval for native LLVM #463361

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
6f5150d
llvmPackages.bintools: add pname and version
RossComputerGuy Nov 20, 2025
25908a8
pkgs/stdenv/linux/default.nix: force binutils
RossComputerGuy Nov 20, 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
2 changes: 2 additions & 0 deletions pkgs/development/compilers/llvm/common/bintools.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ let
in
runCommand "llvm-binutils-${version}"
{
pname = "llvm-binutils";
inherit version;
preferLocalBuild = true;
passthru = {
isLLVM = true;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/stdenv/linux/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
# We wouldn't need to *copy* all, but it's easier and the result is temporary anyway.
installPhase = ''
mkdir -p "$out"/bin
cp -a '${prevStage.bintools.bintools}'/bin/* "$out"/bin/
cp -a '${prevStage.binutils.bintools}'/bin/* "$out"/bin/
Copy link
Member

@alyssais alyssais Jan 28, 2026

Choose a reason for hiding this comment

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

Won't this do the wrong thing when we're using LLVM bintools?

Copy link
Member Author

@RossComputerGuy RossComputerGuy Jan 28, 2026

Choose a reason for hiding this comment

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

Isn't binutils an alias for whatever linker is configured via linker in {local,cross}System?

Copy link
Member

@alyssais alyssais Jan 28, 2026

Choose a reason for hiding this comment

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

No, that's what bintools is. binutils is GNU binutils.

Copy link
Member Author

@RossComputerGuy RossComputerGuy Jan 28, 2026

Choose a reason for hiding this comment

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

Huh, I'll have to take a look at what I did. It might've been an infinite recursion thing. I'm traveling right now so I won't be able to look at it for some time.

chmod +w "$out"/bin/ld.bfd
patchelf --set-interpreter '${self.libc}'/lib/ld*.so.? \
--set-rpath "${self.libc}/lib:$(patchelf --print-rpath "$out"/bin/ld.bfd)" \
Expand Down
Loading