Skip to content

Commit 1293f27

Browse files
committed
Fix for ghc >9.10
1 parent a158ea6 commit 1293f27

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

overlays/bootstrap.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ in {
227227
++ onAndroid (onAarch32 (until "9.2" ./patches/ghc/ghc-8.10.7-bionic-libc.patch))
228228
++ onAndroid (onAarch32 (until "9.2" ./patches/ghc/ghc-8.10.7-cross-dont-build-stage2-tools.patch))
229229
++ onAndroid (fromUntil "9.0" "9.10" ./patches/ghc/ghc-9.6-hadrian-android.patch)
230+
++ onAndroid (from "9.10" ./patches/ghc/ghc-9.10-hadrian-android.patch)
230231
++ onMusl (onAarch64 (fromUntil "9.4" "9.8" ./patches/ghc/ghc-9.6-hadrian-strip-cmd.patch))
231232
++ onMusl (onAarch64 (fromUntil "9.8" "9.10" ./patches/ghc/ghc-9.8-hadrian-strip-cmd.patch))
232233
++ onMusl (onAarch64 (fromUntil "9.10" "9.12" ./patches/ghc/ghc-9.10-hadrian-strip-cmd.patch))
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
diff --git a/hadrian/src/Hadrian/Haskell/Cabal.hs b/hadrian/src/Hadrian/Haskell/Cabal.hs
2+
index 17249efd79..ff6cc57949 100644
3+
--- a/hadrian/src/Hadrian/Haskell/Cabal.hs
4+
+++ b/hadrian/src/Hadrian/Haskell/Cabal.hs
5+
@@ -84,5 +84,6 @@ cabalOsString "mingw32" = "windows"
6+
cabalOsString "darwin" = "osx"
7+
cabalOsString "solaris2" = "solaris"
8+
cabalOsString "gnu" = "hurd"
9+
+cabalOsString "linux_android" = "android"
10+
cabalOsString other = other

0 commit comments

Comments
 (0)