Support Cabal calling configure with "--host=arm-android"

input-output-hk · Dec 2, 2024 · f666fdf · f666fdf
1 parent d6ad31d
commit f666fdf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/overlays/bootstrap.nix b/overlays/bootstrap.nix
@@ -235,6 +235,7 @@ in {
                 ++ onAndroid (fromUntil "9.6.3" "9.8.3" ./patches/ghc/ghc-9.6-iog.patch)
                 ++ onAndroid (fromUntil "9.8.3" "9.10"  ./patches/ghc/ghc-9.8.3-iog.patch)
                 ++ onAndroid (fromUntil "9.6" "9.9" ./patches/ghc/ghc-9.6-debug-secno.patch)
+                ++ onAndroid (from "9.8.1" ./patches/ghc/ghc-9.8-android-convert-os.patch)
 
                 # Allow loading static external plugins into cross compilers
                 ++ onCross (fromUntil "9.6.1" "9.11" ./patches/ghc/5c80a27488acfe3610ddfcb99a1e961002e386d0.patch)

diff --git a/overlays/patches/ghc/ghc-9.8-android-convert-os.patch b/overlays/patches/ghc/ghc-9.8-android-convert-os.patch
@@ -0,0 +1,13 @@
+diff --git a/m4/ghc_convert_os.m4 b/m4/ghc_convert_os.m4
+index 586b33d09b..275bd997eb 100644
+--- a/m4/ghc_convert_os.m4
++++ b/m4/ghc_convert_os.m4
+@@ -10,7 +10,7 @@ AC_DEFUN([GHC_CONVERT_OS],[
+       ios|watchos|tvos)
+         $3="ios"
+         ;;
+-      linux-android*)
++      linux-android*|android)
+         $3="linux-android"
+         ;;
+       linux-*|linux)