Skip to content

Commit f666fdf

Browse files
committed
Support Cabal calling configure with "--host=arm-android"
1 parent d6ad31d commit f666fdf

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

overlays/bootstrap.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ in {
235235
++ onAndroid (fromUntil "9.6.3" "9.8.3" ./patches/ghc/ghc-9.6-iog.patch)
236236
++ onAndroid (fromUntil "9.8.3" "9.10" ./patches/ghc/ghc-9.8.3-iog.patch)
237237
++ onAndroid (fromUntil "9.6" "9.9" ./patches/ghc/ghc-9.6-debug-secno.patch)
238+
++ onAndroid (from "9.8.1" ./patches/ghc/ghc-9.8-android-convert-os.patch)
238239

239240
# Allow loading static external plugins into cross compilers
240241
++ onCross (fromUntil "9.6.1" "9.11" ./patches/ghc/5c80a27488acfe3610ddfcb99a1e961002e386d0.patch)
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/m4/ghc_convert_os.m4 b/m4/ghc_convert_os.m4
2+
index 586b33d09b..275bd997eb 100644
3+
--- a/m4/ghc_convert_os.m4
4+
+++ b/m4/ghc_convert_os.m4
5+
@@ -10,7 +10,7 @@ AC_DEFUN([GHC_CONVERT_OS],[
6+
ios|watchos|tvos)
7+
$3="ios"
8+
;;
9+
- linux-android*)
10+
+ linux-android*|android)
11+
$3="linux-android"
12+
;;
13+
linux-*|linux)

0 commit comments

Comments
 (0)