stdenv: move --enable-deterministic-archives flag into GNU wrapper #138289
Conversation
This file contains 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
Ericson2314
reviewed
Sep 17, 2021
alyssais
reviewed
Sep 17, 2021
Where is that?
I am not sure when I'll finish that (as much as I like it!) so without knowing the details, if there is some hack to get rid of now easily, by all means do so. |
76c9a926e06afd07b2a263504f60e64b0675fea7 which Alyssa commented on (a fact that easily gets lost in the github UI…) |
|
Oh I see. Yeah fine for now for sure. |
sternenseemann
force-pushed
the
fix-non-gnu-strip
branch
3 times, most recently
from
8f42223
to
5220c58
Compare
|
I think this is good enough for now. Will need some additional testing though, as it is a full stdenv rebuild on all platforms now. |
alyssais
approved these changes
Sep 18, 2021
sternenseemann
force-pushed
the
fix-non-gnu-strip
branch
from
5220c58
to
4e93308
Compare
* Only try to link libgcc if GCC is actually used * Link libgcc depending on libc (glibc vs. musl), rather than Linux/musl vs. Linux/!musl This is a step towards fixing pkgsLLVM.python3.
`--enable-deterministic-archives` is a GNU specific strip flag and causes other strip implementations (for example LLVM's, see NixOS#138013) to fail. Since strip failures are ignored, this means that stripping doesn't work at all in certain situation (causing unnecessary dependencies etc.). To fix this, no longer pass `--enable-deterministic-archives` unconditionally, but instead add it in a GNU binutils specific strip wrapper only. `commonStripFlags` was only used for this flag, so we can remove it altogether. Future work could be to make a generic strip wrapper, with support for nix-support/strip-flags-{before,after} and NIX_STRIP_FLAGS_{BEFORE,AFTER}. This possibly overkill and unnecessary though -- also with the additional challenge of incorporating the darwin strip wrapper somehow.
sternenseemann
force-pushed
the
fix-non-gnu-strip
branch
from
4e93308
to
11fe2fc
Compare
ofborg
bot
added
10.rebuild-darwin-stdenv
Closed
|
Checked stripping with |
Ericson2314
approved these changes
Oct 7, 2021
sternenseemann
added a commit
to sternenseemann/nixpkgs
that referenced
this pull request
Oct 7, 2021
PR NixOS#138289 stopped --enable-deterministic-archives being passed by setup.sh, so we need to make sure we wrap strip and pass this flag if it is supported (which is the case for GNU binutils). This mirrors the behavior of the gnu strip wrapper for aarch64-darwin.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation for this change
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)