From: Simon Marlow Date: Thu, 23 Sep 2010 12:35:58 +0000 (+0000) Subject: move CHECKED settings to the right place X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=b6fa4b36c7b0c38f36d79b2a74f1575fa0bee052 move CHECKED settings to the right place --- diff --git a/ghc.mk b/ghc.mk index 8fb95d0..3348d47 100644 --- a/ghc.mk +++ b/ghc.mk @@ -485,6 +485,23 @@ $(error Unknown integer library: $(INTEGER_LIBRARY)) endif endif +# ---------------------------------------------- +# Checking packages with 'cabal check' + +ifeq "$(CHECK_PACKAGES)" "YES" +all: check_packages +endif + +# These packages don't pass the Cabal checks because hs-source-dirs +# points outside the source directory. This isn't a real problem in +# these cases, so we just skip checking them. +# NB. these must come before we include the ghc.mk files below, because +# they disable the relevant rules. +CHECKED_libraries/dph/dph-seq = YES +CHECKED_libraries/dph/dph-par = YES +# In compiler's case, include-dirs points outside of the source tree +CHECKED_compiler = YES + # ----------------------------------------------------------------------------- # Include build instructions from all subdirs @@ -655,21 +672,6 @@ $(foreach pkg,$(PACKAGES) $(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-instal # Add $(GhcBootLibHcOpts) to all stage0 package builds $(foreach pkg,$(STAGE0_PACKAGES),$(eval libraries/$(pkg)_dist-boot_HC_OPTS += $$(GhcBootLibHcOpts))) -# ---------------------------------------------- -# Checking packages with 'cabal check' - -ifeq "$(CHECK_PACKAGES)" "YES" -all: check_packages -endif - -# These packages don't pass the Cabal checks because hs-source-dirs -# points outside the source directory. This isn't a real problem in -# these cases, so we just skip checking them. -CHECKED_libraries/dph/dph-seq = YES -CHECKED_libraries/dph/dph-par = YES -# In compiler's case, include-dirs points outside of the source tree -CHECKED_compiler = YES - # ----------------------------------------------- # Haddock-related bits