diff --git a/latest.Dockerfile b/latest.Dockerfile index a764cd68606a3396429e2658cdf500a287499a31..435b339efa9755260579a78ebee2df4edacebe50 100644 --- a/latest.Dockerfile +++ b/latest.Dockerfile @@ -45,9 +45,11 @@ RUN cd /tmp \ && gpg --verify "ghc-$GHC_VERSION-src.tar.xz.sig" "ghc-$GHC_VERSION-src.tar.xz" \ && tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \ && cd "ghc-$GHC_VERSION" \ - # Apply patches + ## Apply patch: Bump max LLVM version to 19 (not inclusive) + ## https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12726 && mv "/tmp/$GHC_VERSION.patch" . \ && patch -p0 <"$GHC_VERSION.patch" \ + ## Configure and build && ./boot.source \ && ./configure \ ## Use the LLVM backend diff --git a/prior/9.6.5.Dockerfile b/prior/9.6.5.Dockerfile index 53b7244e5ea5dc46ec0a6638b2f593e873bf22a5..0107db6af8e27d331edab68d2b0849aa13e28b5a 100644 --- a/prior/9.6.5.Dockerfile +++ b/prior/9.6.5.Dockerfile @@ -44,9 +44,11 @@ RUN cd /tmp \ && gpg --verify "ghc-$GHC_VERSION-src.tar.xz.sig" "ghc-$GHC_VERSION-src.tar.xz" \ && tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \ && cd "ghc-$GHC_VERSION" \ - # Apply patches + ## Apply patch: Bump max LLVM version to 19 (not inclusive) + ## https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12726 && mv "/tmp/$GHC_VERSION.patch" . \ && patch -p0 <"$GHC_VERSION.patch" \ + ## Configure and build && ./boot.source \ && ./configure --disable-ld-override LD=ld.gold \ ## Use the LLVM backend diff --git a/prior/9.6.6.Dockerfile b/prior/9.6.6.Dockerfile index 504e95f49b1218f940be0804aec222591fc3a1d1..bea6047d07aead498aafa84699062d711908bacb 100644 --- a/prior/9.6.6.Dockerfile +++ b/prior/9.6.6.Dockerfile @@ -44,9 +44,11 @@ RUN cd /tmp \ && gpg --verify "ghc-$GHC_VERSION-src.tar.xz.sig" "ghc-$GHC_VERSION-src.tar.xz" \ && tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \ && cd "ghc-$GHC_VERSION" \ - # Apply patches + ## Apply patch: Bump max LLVM version to 19 (not inclusive) + ## https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12726 && mv "/tmp/$GHC_VERSION.patch" . \ && patch -p0 <"$GHC_VERSION.patch" \ + ## Configure and build && ./boot.source \ && ./configure --disable-ld-override LD=ld.gold \ ## Use the LLVM backend diff --git a/prior/9.8.2.Dockerfile b/prior/9.8.2.Dockerfile index fc522d4249d89d11fb40efe52054bd891c0ff42a..4d4fcb2731b5e18b5516f6051c2e0d761b2d5195 100644 --- a/prior/9.8.2.Dockerfile +++ b/prior/9.8.2.Dockerfile @@ -44,9 +44,11 @@ RUN cd /tmp \ && gpg --verify "ghc-$GHC_VERSION-src.tar.xz.sig" "ghc-$GHC_VERSION-src.tar.xz" \ && tar -xJf "ghc-$GHC_VERSION-src.tar.xz" \ && cd "ghc-$GHC_VERSION" \ - # Apply patches + ## Apply patch: Bump max LLVM version to 19 (not inclusive) + ## https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12726 && mv "/tmp/$GHC_VERSION.patch" . \ && patch -p0 <"$GHC_VERSION.patch" \ + ## Configure and build && ./boot.source \ && ./configure --disable-ld-override LD=ld.gold \ ## Use the LLVM backend