-
-
Notifications
You must be signed in to change notification settings - Fork 14.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
glibc, openssl: unbreak cross eval (with minor caveats) #79738
Conversation
It's certainly better to have those two caveats than not evaluate. Both seem rather niche. Unfortunately I failed to find a better way. I started testing builds of several cross variants; all seem OK.
Tested building bash on some cross examples that came into my mind: nix build -f . bash --arg crossSystem '(import ./lib).systems.examples.armv7l-hf-multiplatform'
nix build -f . bash --arg crossSystem '(import ./lib).systems.examples.aarch64-multiplatform'
nix build -f . bash --arg crossSystem '(import ./lib).systems.examples.musl64' |
Is the |
It's separate in the sense of being put into a separate derivation output, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested cross eval
separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; | ||
separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) | ||
&& stdenv.hostPlatform == stdenv.buildPlatform # unable to fix infinite recursion on stdenv.cc | ||
&& stdenv.cc.isGNU; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the fix is good, but it sounds like we need to tweak llvm to work with separate-debug-info.sh, since I bet that everything is broken, not just openssl.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, that certainly seems preferable, but I have no idea about difficulty of that :-)
I merged relatively fast to avoid additional cherry-pick after 20.03 branch-off. We can improve later if there's an idea how. |
Thanks to python3Minimal. This reverts part of c203848 NixOS#79738.
It's certainly better to have those two caveats than not evaluate.
Both seem rather niche. Unfortunately I failed to find a better way.
I started testing builds of several cross variants; all seem OK.
Fixes #79610 (with minor caveats)