openjdk: Clean up platform conditionals #35450
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
commented
Feb 24, 2018
| done | ||
|
|
||
| find $out -name \*.so\* | while read lib; do | ||
| patchelf --set-interpreter ${glibc.out}/lib/ld-linux*.so.2 $lib || true | ||
| patchelf --set-rpath "${glibc.out}/lib:${stdenv.cc.cc.lib}/lib:$LIBDIRS" $lib || true | ||
| patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux*.so.2 $lib || true |
There was a problem hiding this comment.
Not sure whether glibc can be dropped like that.
There was a problem hiding this comment.
There are nss modules in glibc, but musl don't support those anyway.
On at least NixOS we also use nscd, which is apparently also supported by musl.
I have not seen any port of jdk, that uses anything but glibc though.
There was a problem hiding this comment.
While we are touching this wouldn't it make sense to use $NIX_CC/nix-support/dynamic-linker instead of ld-linux*.so.2?
In my yet not working WIP for aarch64 for openjdk I had to do that. Due to time constraints that work might not continue soon on my end thought..
There was a problem hiding this comment.
Thanks for the info you two!
Yeah my thoughts are even if it doesn't work, its better to require stdenv.cc.libc to be glibc (which could be achieved with a one-off override, rather than whole-world stdenv switch) than hack it in like that.
|
Failure on aarch64-linux (full log) Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Partial log (click to expand)
|
|
cc @andir |
|
Failure on x86_64-linux (full log) Partial log (click to expand)
|
Ericson2314
force-pushed
the
android-clean
branch
from
0fbd599
to
47d074b
Compare
|
Failure on aarch64-linux (full log) Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Partial log (click to expand)
|
|
Failure on x86_64-linux (full log) Partial log (click to expand)
|
Ericson2314
force-pushed
the
android-clean
branch
from
47d074b
to
933e866
Compare
|
Failure on aarch64-linux (full log) Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Partial log (click to expand)
|
|
Failure on x86_64-linux (full log) Partial log (click to expand)
|
|
Built manually. |
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
Better style, more robust with an eye towards cross compilation / portability.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)