X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=755b9aedd4c468ea375c72730c6b8ad61d95989a;hb=b3ac03eb1d7a3f993cc9b4cbcc4815b52b2aea0b;hp=015e3b464e5bb13d224ef359dd57217fbd18f644;hpb=7f4b8d9bfbfb0556d51ba1fb25f18e424bd5bf9c;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 015e3b4..755b9ae 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -919,6 +919,8 @@ $(eval $(call bindist,.,\
 	mk/project.mk \
 	mk/install.mk.in \
 	bindist.mk \
+	libraries/gen_contents_index \
+	libraries/prologue.txt \
 	libraries/dph/LICENSE \
  ))
 endif
@@ -1058,7 +1060,13 @@ publish-sdist :
 endif
 
 ifeq "$(BootingFromHc)" "YES"
-SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
+# In a normal build we use GHC to compile C files (see
+# rules/c-suffix-rules.mk), which passes a number of its own options
+# to the C compiler.  So when bootstrapping we have to provide these
+# flags explicitly to C compilations.
+SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER
+SRC_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
+SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR)
 endif
 
 # -----------------------------------------------------------------------------