File tree Expand file tree Collapse file tree 2 files changed +11
-0
lines changed Expand file tree Collapse file tree 2 files changed +11
-0
lines changed Original file line number Diff line number Diff line change 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 ) )
Original file line number Diff line number Diff line change 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
You can’t perform that action at this time.
0 commit comments