summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Wilson <douglas.wilson@gmail.com>2022-08-03 17:17:36 +0100
committerDouglas Wilson <douglas.wilson@gmail.com>2022-08-03 17:17:36 +0100
commit12ae2a9cf89af3ae9e4df051818b631cf213a1b8 (patch)
treeedbc6b32ea861e1243dd30784dc127507ad93dc4
parentb147ac169d38c874cf8b40c330a127c22bbc17ed (diff)
downloadhaskell-12ae2a9cf89af3ae9e4df051818b631cf213a1b8.tar.gz
ghc-9.4: make build system: add container module dependencies on template-haskellwip/9.4-finalise2
-rw-r--r--ghc.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/ghc.mk b/ghc.mk
index 69186b0371..1260fab507 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -504,6 +504,12 @@ STAGE0_PKG_DEPS := \
libraries/Cabal/Cabal_dist-boot_CONFIGURE_OPTS += --exact-configuration $(BOOT_PKG_DEPS) $(STAGE0_PKG_DEPS)
+# See Note [Support for building ghc 9.4 with the make build system]
+libraries/containers/containers/dist-install/build/Data/IntMap/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
+libraries/containers/containers/dist-install/build/Data/Graph.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
+libraries/containers/containers/dist-install/build/Data/Set/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
+libraries/containers/containers/dist-install/build/Data/IntSet/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
+
ifeq "$(BIGNUM_BACKEND)" "gmp"
GMP_ENABLED = YES
libraries/ghc-bignum_CONFIGURE_OPTS += --configure-option="--with-gmp"
@@ -1630,3 +1636,6 @@ phase_1_builds: $(PACKAGE_DATA_MKS)
# * We require a boot compiler < ghc-9.2. See issue #21914
# * We carefully build stage0 Cabal with the boot compiler's process library,
# which does not satisfy Cabal's bounds. See issue #21953
+# * We add an explicit dependencies from container modules containing splices to
+# libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.o
+# becasue those splices induce an implicit dependency on the template-haskell module.