projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
75736ff
)
Move a bit of build system code
author
Ian Lynagh
<igloo@earth.li>
Fri, 9 Jul 2010 22:45:34 +0000
(22:45 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Fri, 9 Jul 2010 22:45:34 +0000
(22:45 +0000)
ghc.mk
patch
|
blob
|
history
diff --git
a/ghc.mk
b/ghc.mk
index
8e39842
..
a9ad5ea
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-591,18
+591,6
@@
ifneq "$(findstring $(phase),0 1 2)" ""
ghc_stage1_DISABLE = YES
endif
ghc_stage1_DISABLE = YES
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)" ""
# In phases 0-3, we disable stage2-3, the full libraries and haddock
utils/haddock_dist_DISABLE = YES
ifneq "$(findstring $(phase),0 1 2 3)" ""
# In phases 0-3, we disable stage2-3, the full libraries and haddock
utils/haddock_dist_DISABLE = YES
@@
-620,6
+608,18
@@
$(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \
libraries/$(lib)_dist-install_DISABLE = YES))
endif
libraries/$(lib)_dist-install_DISABLE = YES))
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
# points outside the source directory. This isn't a real problem in
# these cases, so we just skip checking them.
# 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.