Unbreak Aarch32 cross-compilation #411
Conversation
There was a problem hiding this comment.
Except for the perf part and the indentation, looks good to me.
BTW. do you know if we upstreamed the prim-no-arm-atomics, and global-offset-table patches?
@eamsden, @hamishmack am I the only one who reads versionOlder to mean (>) and versionAtLeast as (>=)? Should we rename versionOlder to something better?
| }; | ||
| ghcDrvOverrides = drv: { | ||
| hardeningDisable = (drv.hardeningDisable or []) ++ [ "stackprotector" "format" ]; | ||
| hardeningDisable = (drv.hardeningDisable or []) ++ [ "stackprotector" "format" ] ++ lib.optionals super.stdenv.hostPlatform.isAarch32 [ "pic" "pie" ]; |
There was a problem hiding this comment.
Ohh we lost those? I thought we had kept them.
| @@ -99,6 +99,9 @@ in { | |||
| ++ self.lib.optional (version == "8.6.4") ./patches/ghc/ghc-8.6.4-better-plusSimplCountErrors.patch | |||
| ++ self.lib.optional (versionAtLeast "8.6.4" && self.stdenv.isDarwin) ./patches/ghc/ghc-macOS-loadArchive-fix.patch | |||
| ++ self.lib.optional (versionAtLeast "8.4.4" && self.stdenv.isDarwin) ./patches/ghc/ghc-darwin-gcc-version-fix.patch | |||
| ++ self.lib.optional (versionAtLeast "8.6.4" && versionOlder "8.8") ./patches/ghc/ghc-8.6.4-prim-no-arm-atomics.patch | |||
I changed it in the ghc 8.8 PR to from, until and fromUntil. |
Co-Authored-By: Moritz Angermann <moritz.angermann@gmail.com>
I don't recall. I recall not being happy with them and wanting to work on making the linker not use a page per label. |
ghost
mentioned this pull request
This PR contains everything I had to do to actually cross-compile stuff with ghc-8.6.4 and ghc-8.6.5. It mostly involves bringing over patches that were left behind when cross-compilation infrastructure was moved from iohk-nix to haskell.nix.