Skip to content

Commit 79c3370

Browse files
committed
Relax llvm max version
1 parent 09bc75d commit 79c3370

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
@@ -229,6 +229,7 @@ in {
229229
++ onAndroid (onAarch32 (until "9.2" ./patches/ghc/ghc-8.10.7-cross-dont-build-stage2-tools.patch))
230230
++ onAndroid (fromUntil "9.0" "9.10" ./patches/ghc/ghc-9.6-hadrian-android.patch)
231231
++ onAndroid (from "9.10" ./patches/ghc/ghc-9.10-hadrian-android.patch)
232+
++ onAndroid (fromUntil "9.10" "9.11" ./patches/ghc/ghc-9.10-relax-llvm-max-version.patch)
232233
++ onMusl (onAarch64 (fromUntil "9.4" "9.8" ./patches/ghc/ghc-9.6-hadrian-strip-cmd.patch))
233234
++ onMusl (onAarch64 (fromUntil "9.8" "9.10" ./patches/ghc/ghc-9.8-hadrian-strip-cmd.patch))
234235
++ onMusl (onAarch64 (fromUntil "9.10" "9.12" ./patches/ghc/ghc-9.10-hadrian-strip-cmd.patch))
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/configure.ac b/configure.ac
2+
index 1bf37789c7..3f91701dbe 100644
3+
--- a/configure.ac
4+
+++ b/configure.ac
5+
@@ -492,7 +492,7 @@ AC_SUBST(InstallNameToolCmd)
6+
# versions of LLVM simultaneously, but that stopped working around
7+
# 3.5/3.6 release of LLVM.
8+
LlvmMinVersion=13 # inclusive
9+
-LlvmMaxVersion=16 # not inclusive
10+
+LlvmMaxVersion=18 # not inclusive
11+
AC_SUBST([LlvmMinVersion])
12+
AC_SUBST([LlvmMaxVersion])
13+

0 commit comments

Comments
 (0)