projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make dph required
[ghc-hetmet.git]
/
ghc.mk
diff --git
a/ghc.mk
b/ghc.mk
index
4d2a29a
..
f251635
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-320,7
+320,6
@@
endif
PACKAGES += haskeline
PACKAGES += haskeline
-ifneq "$(wildcard libraries/dph)" ""
PACKAGES_STAGE2 += \
dph/dph-base \
dph/dph-prim-interface \
PACKAGES_STAGE2 += \
dph/dph-base \
dph/dph-prim-interface \
@@
-328,7
+327,6
@@
PACKAGES_STAGE2 += \
dph/dph-prim-par \
dph/dph-seq \
dph/dph-par
dph/dph-prim-par \
dph/dph-seq \
dph/dph-par
-endif
BOOT_PKGS = Cabal hpc extensible-exceptions
BOOT_PKGS = Cabal hpc extensible-exceptions
@@
-488,10
+486,10
@@
BUILD_DIRS += \
utils/haddock/doc \
$(patsubst %, libraries/%, $(PACKAGES)) \
$(patsubst %, libraries/%, $(PACKAGES_STAGE2)) \
utils/haddock/doc \
$(patsubst %, libraries/%, $(PACKAGES)) \
$(patsubst %, libraries/%, $(PACKAGES_STAGE2)) \
+ libraries/dph \
compiler \
$(GHC_HSC2HS_DIR) \
$(GHC_PKG_DIR) \
compiler \
$(GHC_HSC2HS_DIR) \
$(GHC_PKG_DIR) \
- utils/hasktags \
utils/hpc \
utils/runghc \
ghc
utils/hpc \
utils/runghc \
ghc
@@
-522,7
+520,6
@@
ifneq "$(findstring $(phase),0 1 2 3)" ""
utils/haddock_dist_DISABLE = YES
utils/runghc_dist_DISABLE = YES
utils/hpc_dist_DISABLE = YES
utils/haddock_dist_DISABLE = YES
utils/runghc_dist_DISABLE = YES
utils/hpc_dist_DISABLE = YES
-utils/hasktags_dist_DISABLE = YES
utils/hsc2hs_dist-install_DISABLE = YES
utils/ghc-pkg_dist-install_DISABLE = YES
compiler_stage2_DISABLE = YES
utils/hsc2hs_dist-install_DISABLE = YES
utils/ghc-pkg_dist-install_DISABLE = YES
compiler_stage2_DISABLE = YES
@@
-533,9
+530,6
@@
$(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \
libraries/$(lib)_dist-install_DISABLE = YES))
endif
libraries/$(lib)_dist-install_DISABLE = YES))
endif
-ifneq "$(wildcard libraries/dph)" ""
-include libraries/dph/ghc.mk
-endif
include $(patsubst %, %/ghc.mk, $(BUILD_DIRS))
# We need -fno-warn-deprecated-flags to avoid failure with -Werror
include $(patsubst %, %/ghc.mk, $(BUILD_DIRS))
# We need -fno-warn-deprecated-flags to avoid failure with -Werror
@@
-893,7
+887,11
@@
maintainer-clean : distclean
$(RM) configure mk/config.h.in
$(RM) -r autom4te.cache libraries/*/autom4te.cache
$(RM) ghc.spec
$(RM) configure mk/config.h.in
$(RM) -r autom4te.cache libraries/*/autom4te.cache
$(RM) ghc.spec
- $(RM) libraries/*/GNUmakefile libraries/*/ghc.mk libraries/*/configure
+ $(RM) $(patsubst %, libraries/%/GNUmakefile, \
+ $(PACKAGES) $(PACKAGES_STAGE2))
+ $(RM) $(patsubst %, libraries/%/ghc.mk, $(PACKAGES) $(PACKAGES_STAGE2))
+ $(RM) $(patsubst %, libraries/%/configure, \
+ $(PACKAGES) $(PACKAGES_STAGE2))
$(RM) libraries/base/include/HsBaseConfig.h.in
$(RM) libraries/directory/include/HsDirectoryConfig.h.in
$(RM) libraries/process/include/HsProcessConfig.h.in
$(RM) libraries/base/include/HsBaseConfig.h.in
$(RM) libraries/directory/include/HsDirectoryConfig.h.in
$(RM) libraries/process/include/HsProcessConfig.h.in