cc-wrapper: Clean up dynamic linking with x86 multilib #29568
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, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @orivej and @abbradar to be potential reviewers. |
Ericson2314
commented
Sep 19, 2017
| -m) | ||
| case "$p" in | ||
| elf_i386) link32=1;; | ||
| *) link32=0;; |
There was a problem hiding this comment.
I assume only the last -m flag matters.
Ericson2314
force-pushed
the
cc-wrapper-32
branch
4 times, most recently
from
fd4ecec
to
6e56d6e
Compare
Ericson2314
added
the
6.topic: cross-compilation
Ericson2314
force-pushed
the
cc-wrapper-32
branch
2 times, most recently
from
4411f99
to
2eea93f
Compare
Ericson2314
force-pushed
the
cc-wrapper-32
branch
4 times, most recently
from
b3b79c6
to
c8b5f99
Compare
Ericson2314
force-pushed
the
cc-wrapper-32
branch
from
c8b5f99
to
d5e80eb
Compare
Ericson2314
force-pushed
the
cc-wrapper-32
branch
3 times, most recently
from
46361c0
to
706e281
Compare
|
Ok, this one is ready for review next! |
orivej
reviewed
Sep 28, 2017
| @@ -71,8 +71,18 @@ declare -a libDirs | |||
| declare -A libs | |||
| relocatable= | |||
There was a problem hiding this comment.
It seems that link32 may be left undefined. I'd suggest declaring it here and moving these declarations under the following comment.
There was a problem hiding this comment.
I'm surprised I didn't hit that with set -u.
8 tasks
It's better layering to do everything in ld-wrapper. Also, use numeric comparisons for `relocatable`.
Ericson2314
force-pushed
the
cc-wrapper-32
branch
from
706e281
to
fdbda21
Compare
|
Doing rebuilds overnight. Hope you all like it tomorrow! edit suceeded. |
orivej
approved these changes
Sep 29, 2017
LnL7
approved these changes
Oct 1, 2017
vcunat
approved these changes
Oct 1, 2017
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 better layering to do everything in ld-wrapper.
I pulled this out of #29396 as its good to consider on its own. It was reviewed there by @orivej, however.
Things done
build-use-sandboxinnix.confon non-NixOS)statifier, some multilib-using Linux derivation. Tested that 32- and 64-bit binaries both ran.nix-shell -p nox --run "nox-review wip"./result/bin/)CC @orivej