openssl: switch to linux-x86 and linux-x86_64 targets #71457
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
ofborg
bot
added
10.rebuild-darwin: 0
10.rebuild-linux: 501+
10.rebuild-linux: 5001+
labels
FRidh
added
the
6.topic: cross-compilation
|
cc @dtzWill @matthewbauer for cross-compiling / musl |
veprbl
reviewed
Oct 20, 2019
| armv6l-linux = "./Configure linux-armv4 -march=armv6"; | ||
| armv7l-linux = "./Configure linux-armv4 -march=armv7-a"; | ||
| x86-linux = "./Configure linux-x86"; |
There was a problem hiding this comment.
The "x86-linux", is it a valid value for stdenv.hostPlatform.system?
There was a problem hiding this comment.
I am so damned. It should be i686-linux, sorry.
|
I can confirm that this change fixes the compilation of pkgsCross.musl64.openssl. |
dingxiangfei2009
force-pushed
the
openssl-musl
branch
from
664b1d6
to
ed88438
Compare
|
@petabyteboy Yes, definitely. Sorry for the inconvenience. |
|
Looks good to me now |
matthewbauer
approved these changes
Oct 21, 2019
c0bw3b
changed the title
|
Ugh, wrong branch. Please check that as well when reviewing (and merging...)! |
|
703e446 is now in staging |
|
This broke pkgs.i686Linux.openssl_1_0_2, #71786 |
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
Fix #71455
This PR switches Linux builds to target
linux-x86_64andlinux-x86instead oflinux-generic*, while the upstream resolve the cross-compilation issue.Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @peti