openssl: Fix windows cross compile #229465
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
|
Would you please make this PR rebuild-free under Linux? |
ofborg
bot
added
6.topic: cross-compilation
hamishmack
force-pushed
the
hkm/openssl-windows-cross
branch
from
9ed7fd7
to
6d7b0ec
Compare
It was broken by 18f1be7
hamishmack
force-pushed
the
hkm/openssl-windows-cross
branch
from
6d7b0ec
to
6697c41
Compare
Done |
ofborg
bot
added
10.rebuild-darwin: 0
hamishmack
added a commit
to input-output-hk/haskell.nix
that referenced
this pull request
May 3, 2023
wegank
approved these changes
May 3, 2023
alyssais
approved these changes
May 3, 2023
hamishmack
added a commit
to input-output-hk/haskell.nix
that referenced
this pull request
May 4, 2023
Update the nixpkgs pins to keep them up to date and to help catch issues that arise when using newer versions. This PR includes fixes and work arounds for a number that came up when nixpkgs was updated: * GHC 9.6.1 is now included in nixpkgs, but the package database locations and formats are different enough that compiling tools with it does not work. The work around is not to use this version of GHC from nixpkgs for now. * Autoreconf now has a newer `config.sub` and this broke a couple of things. It overwrote the version used for GHC 9.6.1 (which included ghcjs) and it broke the library patches in ghcjs 8.10.7. * We included a work around for a openssl windows cross compilation issue (also fixed it upstream NixOS/nixpkgs#229465). * -optc-mno-outline-atomics was added for lGHC builds targeting aarch64 linux that now use ghc 12
12 tasks
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.
Windows cross compile of openssl was broken by 18f1be7
You can test with:
It currently fails because of #120726
This fix disables the use of
makeWrapperwhen!stdenv.hostPlatform.isWindowsin the same way the old version skipped usingc_rehashfor windows builds to work.