X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fvalidate-settings.mk;h=322aaef6582191be967cf6271708ff1903228379;hb=c8ef1c4a3da7b86516866d8e30e81ef4f9a06041;hp=8ab5af8392fb116eb32c5232c118e217ad4d92b8;hpb=8a2b4cfc761466e51bd77e7f40d70df5c2747578;p=ghc-hetmet.git

diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 8ab5af8..322aaef 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -22,6 +22,13 @@ STRIP           = :
 
 CHECK_PACKAGES = YES
 
+# dblatex with miktex under msys/mingw can't build the PS and PDF docs,
+# and just building the HTML docs is sufficient to check that the
+# markup is correct, so we turn off PS and PDF doc building when
+# validating.
+BUILD_DOCBOOK_PS  = NO
+BUILD_DOCBOOK_PDF = NO
+
 ifeq "$(ValidateHpc)" "YES"
 GhcStage2HcOpts += -fhpc -hpcdir $(TOP)/testsuite/hpc_output/
 endif
@@ -35,6 +42,8 @@ libraries/time_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-do-bind
 # On Windows, there are also some unused import warnings
 libraries/time_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports
 
+libraries/haskeline_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports
+
 # Temporarily turn off unused-import warnings for the binary package
 libraries/binary_dist-boot_EXTRA_HC_OPTS += -fno-warn-unused-imports
 libraries/binary_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports