texinfo: fix cross #34180
Merged
texinfo: fix cross #34180
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
requested changes
Jan 23, 2018
| stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk" | ||
| ++ optionals crossCompiling [ | ||
| "PERL=${buildPackages.perl}/bin/perl" | ||
| "BUILD_CC=${buildPackages.stdenv.cc.targetPrefix}gcc" |
There was a problem hiding this comment.
Should be not needed anymore?
| @@ -19,6 +26,13 @@ stdenv.mkDerivation rec { | |||
| installTargets="install install-tex"; | |||
| ''; | |||
|
|
|||
| configureFlags = | |||
| stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk" | |||
| ++ optionals crossCompiling [ | |||
| # We need a native compiler to build perl XS extensions | ||
| # when cross-compiling. | ||
| depsBuildBuild = [ buildPackages.stdenv.cc ]; | ||
| nativeBuildInputs = [ perl ]; |
There was a problem hiding this comment.
Do we need native perl too then?
|
|
||
| with stdenv.lib; | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| let | ||
| crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform; |
There was a problem hiding this comment.
I think this is not needed if the stuff below is unconditional?
dtzWill
force-pushed
the
fix/texinfo-cross
branch
2 times, most recently
from
15a6bff
to
3182c47
Compare
Ericson2314
added
the
6.topic: cross-compilation
dtzWill
force-pushed
the
fix/texinfo-cross
branch
from
3182c47
to
f57fc78
Compare
Ericson2314
approved these changes
Jan 23, 2018
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.
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)Have not re-tested on top of latest staging,
but works well on my local patch queue.