cc-wrapper, cc-wrapper-old: Simplify shell logic #29550
Merged
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
added
the
6.topic: cross-compilation
|
@Ericson2314, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @gridaphobe and @vcunat to be potential reviewers. |
veprbl
reviewed
Sep 19, 2017
| shell = if shell == "" then stdenv.shell else | ||
| if builtins.isAttrs shell then (shell + shell.shellPath) | ||
| else shell; | ||
| shell = shell + lib.optionalString (stdenv ? shellPath) stdenv.shellPath; |
There was a problem hiding this comment.
Maybe shell = shell + (stdenv.shellPath or "");?
There was a problem hiding this comment.
Good call. Thanks!
veprbl
reviewed
Sep 19, 2017
| @@ -86,7 +86,8 @@ stdenv.mkDerivation { | |||
|
|
|||
| preferLocalBuild = true; | |||
|
|
|||
| inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin; | |||
| inherit cc libc_bin libc_dev libc_lib binutils_bin coreutils_bin; | |||
| shell = getBin shell + stdenv.lib.optionalString (stdenv ? shellPath) stdenv.shellPath; | |||
Ericson2314
force-pushed
the
cc-wrapper-cross-shell
branch
3 times, most recently
from
ad01e6f
to
28d4824
Compare
Ericson2314
force-pushed
the
cc-wrapper-cross-shell
branch
from
28d4824
to
6c74ee6
Compare
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
crossDrvis now the default so we don't need to worry about that in build != host builds.shell is the build time shell, so
wrapCCCrossdoesn't need to worry, as build == host.shell.shellPathwill always be appended where useful.Complicated
shell == ""logic served no purpose.Things done
Not everything relevant builds currently, but I don't think any hashes in practice changed either (though hypothetical overrides would for the better).
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)