X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=b217ce7c852aadcac676bd66d37ee66284ca84a3;hb=c6144cbcdb49ced6aa8746f584e045e63e24b168;hp=4a9b28d27ab1f9886ad7c2ae03f7e47de98bcb77;hpb=7dbc1d8f8fb650162e01f6eab8dabaf1f53c819d;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 4a9b28d..b217ce7 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -627,12 +627,29 @@ include $(patsubst %, %/ghc.mk, $(BUILD_DIRS))
 GhcLibHcOpts += -fno-warn-deprecated-flags
 GhcBootLibHcOpts += -fno-warn-deprecated-flags
 
+# ----------------------------------------------
+# Per-package compiler flags
+# 
+# If you want to add per-package compiler flags, this 
+# is the place to do it.  Do it like this for package <pkg>
+#   
+#   libraries/<pkg>_dist-boot_HC_OPTS += -Wwarn
+#   libraries/<pkg>_dist-install_HC_OPTS += -Wwarn
+
+
 # Add $(GhcLibHcOpts) to all library builds
 $(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += $$(GhcLibHcOpts)))
 
 # XXX Hack; remove this
+# Use -Wwarn for dph
 $(foreach pkg,$(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += -Wwarn))
 
+# XXX Hack; remove this
+# Use -Wwarn for 'binary' becuase it has redundant UNPACK pragmas
+libraries/binary_dist-install_HC_OPTS += -Wwarn
+libraries/binary_dist-boot_HC_OPTS += -Wwarn
+
+# ----------------------------------------------
 # A useful pseudo-target
 .PHONY: stage1_libs
 stage1_libs : $(ALL_STAGE1_LIBS)
@@ -937,6 +954,7 @@ $(eval $(call bindist,.,\
 	docs/index.html \
 	compiler/stage2/doc \
 	$(wildcard libraries/*/dist-install/doc/) \
+	$(wildcard libraries/*/*/dist-install/doc/) \
     $(filter-out extra-gcc-opts,$(INSTALL_LIBS)) \
     $(filter-out %/project.mk mk/config.mk %/mk/install.mk,$(MAKEFILE_LIST)) \
 	mk/project.mk \