par: fix static build #107961
Merged
par: fix static build #107961
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
Mic92
reviewed
Dec 30, 2020
KAction
force-pushed
the
par-static
branch
2 times, most recently
from
0d585e2
to
5d7c54d
Compare
Mic92
reviewed
Jan 1, 2021
pkgs/tools/text/par/default.nix
Outdated
Comment on lines
21
to
26
| buildPhase = '' | ||
| make -f protoMakefile \ | ||
| CC="${stdenv.cc.targetPrefix}cc -c" \ | ||
| LINK1=${stdenv.cc.targetPrefix}cc | ||
| ''; |
There was a problem hiding this comment.
I did not saw this earlier, but should it not be feasible to just use makeFlags here?
makeFlags = [
"-f" "protoMakefile"
"CC=${stdenv.cc.targetPrefix}cc -c"
"LINK1=${stdenv.cc.targetPrefix}cc"
];
This would be a bit nicer since it is available in nix-shell i.e. eval make $makeFlags
and it make things like enableParallelBuilding work.
There was a problem hiding this comment.
Does not work for me due space inside of CC. -c gets interpreted as make(1) flag.
There was a problem hiding this comment.
But can work with makeFlagsArray. Do you like this approach (just pushed) better?
This change causes rebuild of both glibc and musl dynamic variants, but no cascade rebuilds.
Mic92
reviewed
Jan 12, 2021
pkgs/tools/text/par/default.nix
Outdated
| buildPhase = ''make -f protoMakefile''; | ||
| makefile = "protoMakefile"; | ||
| preBuild = '' | ||
| makeFlagsArray=( CC="${stdenv.cc.targetPrefix}cc -c" \ |
There was a problem hiding this comment.
This allows to still add stuff to makeFlagsArray in an override:
Suggested change
| makeFlagsArray=( CC="${stdenv.cc.targetPrefix}cc -c" \ | |
| makeFlagsArray+=( CC="${stdenv.cc.targetPrefix}cc -c" \ |
|
@GrahamcOfBorg build par |
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.
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)