make-wrapper should use runtimeShell, not $SHELL, for cross-compilation#50244
Merged
matthewbauer merged 1 commit intoNixOS:stagingfrom Nov 13, 2018
Merged
make-wrapper should use runtimeShell, not $SHELL, for cross-compilation#50244matthewbauer merged 1 commit intoNixOS:stagingfrom
matthewbauer merged 1 commit intoNixOS:stagingfrom
Conversation
Member
|
Seems too vague to be true: wrappers may be executed in the build context too. No? |
Contributor
Author
|
@grahamc sure, but you should be using |
matthewbauer
approved these changes
Nov 11, 2018
Member
|
Switched to staging |
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
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
make-wrapper.shis used to wrap python programs (and others perhaps). Write now it uses the value of $SHELL to get the shell it should use to build its wrapper. However, this only works if the shell being used is the same one as the shell the script will be executed under. This assumption does not hold for cross-compilation. Without this patch, cross-compiled python scripts get a shebang asking to be executed using the build architecture's shell.Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)