Commit ecc60710 authored by Ian Lynagh's avatar Ian Lynagh

Move a bit of build system code

parent 75736ff2
...@@ -591,18 +591,6 @@ ifneq "$(findstring $(phase),0 1 2)" "" ...@@ -591,18 +591,6 @@ ifneq "$(findstring $(phase),0 1 2)" ""
ghc_stage1_DISABLE = YES ghc_stage1_DISABLE = YES
endif endif
ifneq "$(CLEANING)" "YES"
ifeq "$(INTEGER_LIBRARY)" "integer-gmp"
libraries/base_dist-install_CONFIGURE_OPTS += --flags=-integer-simple
else
ifeq "$(INTEGER_LIBRARY)" "integer-simple"
libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple
else
$(error Unknown integer library: $(INTEGER_LIBRARY))
endif
endif
endif
ifneq "$(findstring $(phase),0 1 2 3)" "" ifneq "$(findstring $(phase),0 1 2 3)" ""
# In phases 0-3, we disable stage2-3, the full libraries and haddock # In phases 0-3, we disable stage2-3, the full libraries and haddock
utils/haddock_dist_DISABLE = YES utils/haddock_dist_DISABLE = YES
...@@ -620,6 +608,18 @@ $(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \ ...@@ -620,6 +608,18 @@ $(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \
libraries/$(lib)_dist-install_DISABLE = YES)) libraries/$(lib)_dist-install_DISABLE = YES))
endif endif
ifneq "$(CLEANING)" "YES"
ifeq "$(INTEGER_LIBRARY)" "integer-gmp"
libraries/base_dist-install_CONFIGURE_OPTS += --flags=-integer-simple
else
ifeq "$(INTEGER_LIBRARY)" "integer-simple"
libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple
else
$(error Unknown integer library: $(INTEGER_LIBRARY))
endif
endif
endif
# These packages don't pass the Cabal checks because hs-source-dirs # These packages don't pass the Cabal checks because hs-source-dirs
# points outside the source directory. This isn't a real problem in # points outside the source directory. This isn't a real problem in
# these cases, so we just skip checking them. # these cases, so we just skip checking them.
......
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