elfutils: build out of tree on libc++#419451
Merged
vcunat merged 1 commit intoNixOS:masterfrom Jun 30, 2025
Merged
Conversation
github-actions
bot
added
10.rebuild-darwin: 0
Contributor
without this lines, it is compiling fine for me, should we remove it? |
trofi
force-pushed
the
elfutils-fix-on-libcxx
branch
from
cb3aa57 to
440384f
Compare
Contributor
Author
Good catch! Removed. |
`elfutils` has a `stack` binary built in `src`. When built in source tree this breaks when `#include <stack>` is transitively included in `libc++` via `<iostream>`. The trigger set of options is `-I $(srcdir)` which turns to `-I .` with `./stack` present. The fix turns the above to `-I ../src` without `./stack` present. The change is conditional on `LLVM` to avoid `stdenv` rebuild. We will turn it into unconditional in `staging` once this gets merged. While at it dropped `CFLAGS` / `CXXFLAGS` overrides.
trofi
force-pushed
the
elfutils-fix-on-libcxx
branch
from
440384f to
340cc31
Compare
Contributor
Author
|
Added https://sourceware.org/PR33103 bug reference to the source comment |
Member
|
Diff on GitHub made unreadable by our formatting requirements again 😢 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
elfutilshas astackbinary built insrc.When built in source tree this breaks when
#include <stack>is transitively included inlibc++via<iostream>.The trigger set of options is
-I $(srcdir)which turns to-I .with./stackpresent.The fix turns the above to
-I ../srcwithout./stackpresent.The change is conditional on
LLVMto avoidstdenvrebuild. We will turn it into unconditional instagingonce this gets merged.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.