X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc.mk;h=de304119b85e5609f5524787693dff5ae0d31c93;hp=805fc14f76b761b3092e74e8af1b3e23c9894fdc;hb=5de363ca9ebdb7d85e3c353c1cffdf0a1c11128e;hpb=47c0fd27b2fbad86bdfa646e976fb45dcde59db6

diff --git a/ghc.mk b/ghc.mk
index 805fc14..de30411 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -297,7 +297,7 @@ INTREE_ONLY_PACKAGES := haskeline mtl terminfo utf8-string xhtml
 # packages.
 STAGE2_PACKAGES := dph/dph-base dph/dph-prim-interface dph/dph-prim-seq \
 		   dph/dph-common dph/dph-prim-par dph/dph-par dph/dph-seq \
-		   vector
+		   vector primitive
 
 # Packages that are built by stage0, in addition to stage1.  These
 # packages are dependencies of GHC, that we do not assume the stage0
@@ -767,6 +767,17 @@ ifeq "$(UseArchivesForGhci)" "NO"
 ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(GHCI_LIBS)
 endif
 
+ifeq "$(UseArchivesForGhci)" "YES"
+GHCI_lib_way = v
+else
+GHCI_lib_way = GHCI
+endif
+
+# Deps for TH uses in libraries
+$(foreach way, $(GhcLibWays),$(eval \
+libraries/vector/dist-install/build/Data/Vector/Fusion/Stream/Monadic.$($(way)_osuf): \
+    $(libraries/primitive_dist-install_$(GHCI_lib_way)_LIB) \
+  ))
 endif
 
 # -----------------------------------------------------------------------------