X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=eaf0e29c0a76e888f11d246c76a5f928fb2903c3;hb=39617c7880e3a3e4d713599796e78d57ff66c46c;hp=4640b7f9ac3d238f00d22d74237232f8cbf10175;hpb=d70136c3a53cc08098458bf2a60b1657e71c6697;p=ghc-hetmet.git diff --git a/ghc.mk b/ghc.mk index 4640b7f..eaf0e29 100644 --- a/ghc.mk +++ b/ghc.mk @@ -335,6 +335,7 @@ $(eval $(call addPackage,binary)) $(eval $(call addPackage,bin-package-db)) $(eval $(call addPackage,mtl)) $(eval $(call addPackage,utf8-string)) +$(eval $(call addPackage,xhtml)) $(eval $(call addPackage,terminfo,($$(Windows),NO))) @@ -653,6 +654,9 @@ $(foreach pkg,$(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += libraries/binary_dist-install_HC_OPTS += -Wwarn libraries/binary_dist-boot_HC_OPTS += -Wwarn +# XXX hack: xhtml has warnings +libraries/xhtml_dist-install_HC_OPTS += -Wwarn + # ---------------------------------------------- # A useful pseudo-target .PHONY: stage1_libs @@ -876,7 +880,7 @@ INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe endif -INSTALLED_PACKAGES := $(filter-out haskeline mtl terminfo utf8-string,$(PACKAGES)) +INSTALLED_PACKAGES := $(filter-out haskeline mtl terminfo utf8-string xhtml,$(PACKAGES)) ifeq "$(InstallExtraPackages)" "NO" INSTALLED_PACKAGES := $(filter-out $(EXTRA_PACKAGES), $(INSTALLED_PACKAGES)) endif