From 1420984a496b6494e4149362d8b605f18a7657be Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Tue, 9 Sep 2025 12:43:12 +0900 Subject: [PATCH] cabal: use feature/cross-compile branch --- .gitmodules | 3 ++- compiler/ghc.cabal.in | 2 +- libraries/Cabal | 2 +- libraries/ghc-boot/ghc-boot.cabal.in | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 46f1db3e7cc5..4bf5c2a48311 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,9 @@ ignore = untracked [submodule "libraries/Cabal"] path = libraries/Cabal - url = https://gitlab.haskell.org/ghc/packages/Cabal.git + url = https://github.com/stable-haskell/Cabal.git ignore = untracked + branch = stable-haskell/feature/cross-compile [submodule "libraries/containers"] path = libraries/containers url = https://gitlab.haskell.org/ghc/packages/containers.git diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index d5e60a8d94c1..c7c9f86ed5cf 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -50,7 +50,7 @@ extra-source-files: custom-setup - setup-depends: base >= 3 && < 5, Cabal >= 1.6 && <3.14, directory, process, filepath, containers + setup-depends: base >= 3 && < 5, Cabal >= 1.6 && <3.18, directory, process, filepath, containers Flag internal-interpreter Description: Build with internal interpreter support. diff --git a/libraries/Cabal b/libraries/Cabal index d9b0904b49dc..bc52b097aa2f 160000 --- a/libraries/Cabal +++ b/libraries/Cabal @@ -1 +1 @@ -Subproject commit d9b0904b49dc84e0bfc79062daf2bbdf9d22a422 +Subproject commit bc52b097aa2f26aa440fcacdb506843987bba346 diff --git a/libraries/ghc-boot/ghc-boot.cabal.in b/libraries/ghc-boot/ghc-boot.cabal.in index 7760af0e4ffc..9ccbcc81c76d 100644 --- a/libraries/ghc-boot/ghc-boot.cabal.in +++ b/libraries/ghc-boot/ghc-boot.cabal.in @@ -28,7 +28,7 @@ build-type: Custom extra-source-files: changelog.md custom-setup - setup-depends: base >= 3 && < 5, Cabal >= 1.6 && <3.14, directory, filepath + setup-depends: base >= 3 && < 5, Cabal >= 1.6 && <3.18, directory, filepath source-repository head type: git