Commit b6fa4b36 authored by Simon Marlow's avatar Simon Marlow

move CHECKED settings to the right place

parent c3727966
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment