binutils: Fix cross, again #33186
Merged
binutils: Fix cross, again #33186
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
Binutils is patched so we don't rely on `--rpath-link`.
This ensures we by-default cross-compile to the intended platform.
Ericson2314
added
the
6.topic: cross-compilation
Ericson2314
commented
Dec 29, 2017
| @@ -164,6 +164,20 @@ stdenv.mkDerivation { | |||
| set +u | |||
| ''; | |||
|
|
|||
| emulation = let | |||
There was a problem hiding this comment.
I think I will move this to the lib, with some of the other misc per-tool stuff / provide a way for {build,host,target}Platform (e.g. via crossConfig) to override it. That, however, is a non-hash-breaking change so no reason to rush it now.
Ericson2314
commented
Dec 29, 2017
| @@ -53,6 +53,14 @@ stdenv.mkDerivation rec { | |||
| # elf32-littlearm-vxworks in favor of the first. | |||
| # https://github.com/NixOS/nixpkgs/pull/30484#issuecomment-345472766 | |||
| ./disambiguate-arm-targets.patch | |||
|
|
|||
There was a problem hiding this comment.
I or @bgamari should email upstream cause the default behavior is insane.
There was a problem hiding this comment.
I have reported this at https://sourceware.org/bugzilla/show_bug.cgi?id=22458, with no response so far. (Said so in #30484 (comment).)
There was a problem hiding this comment.
Ah, you meant always-search-rpath.patch below.
Ericson2314
added this to Needed by the big PR---nice to move pick off pieces of it and move here, rebasing the big PR on top
in Cross compilation
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
It's been broken since I made it multi-arch, but this fixes it. Making this a separate PR to lessen the diff, and in case anything breaks later.
Things done
Tested exhaustively in #26805.
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)