Relax llvm max version

input-output-hk · Dec 19, 2024 · 79c3370 · 79c3370
1 parent 09bc75d
commit 79c3370
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
@@ -229,6 +229,7 @@ in {
                 ++ onAndroid (onAarch32 (until "9.2" ./patches/ghc/ghc-8.10.7-cross-dont-build-stage2-tools.patch))
                 ++ onAndroid (fromUntil "9.0" "9.10" ./patches/ghc/ghc-9.6-hadrian-android.patch)
                 ++ onAndroid (from "9.10" ./patches/ghc/ghc-9.10-hadrian-android.patch)
+                ++ onAndroid (fromUntil "9.10" "9.11" ./patches/ghc/ghc-9.10-relax-llvm-max-version.patch)
                 ++ onMusl (onAarch64 (fromUntil "9.4"  "9.8"  ./patches/ghc/ghc-9.6-hadrian-strip-cmd.patch))
                 ++ onMusl (onAarch64 (fromUntil "9.8"  "9.10" ./patches/ghc/ghc-9.8-hadrian-strip-cmd.patch))
                 ++ onMusl (onAarch64 (fromUntil "9.10" "9.12" ./patches/ghc/ghc-9.10-hadrian-strip-cmd.patch))

diff --git a/overlays/patches/ghc/ghc-9.10-relax-llvm-max-version.patch b/overlays/patches/ghc/ghc-9.10-relax-llvm-max-version.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 1bf37789c7..3f91701dbe 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -492,7 +492,7 @@ AC_SUBST(InstallNameToolCmd)
+ # versions of LLVM simultaneously, but that stopped working around
+ # 3.5/3.6 release of LLVM.
+ LlvmMinVersion=13  # inclusive
+-LlvmMaxVersion=16 # not inclusive
++LlvmMaxVersion=18 # not inclusive
+ AC_SUBST([LlvmMinVersion])
+ AC_SUBST([LlvmMaxVersion])
+