projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add dph to build system; patch from Roman Leshchinskiy
[ghc-hetmet.git]
/
ghc.mk
diff --git
a/ghc.mk
b/ghc.mk
index
96b3c96
..
1c86407
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-165,8
+165,6
@@
$(eval $(call clean-target,inplace,,inplace))
# When we're just doing 'make clean' or 'make show', then we don't need
# to build dependencies.
# When we're just doing 'make clean' or 'make show', then we don't need
# to build dependencies.
-NO_INCLUDE_DEPS = NO
-NO_INCLUDE_PKGDATA = NO
ifneq "$(findstring clean,$(MAKECMDGOALS))" ""
NO_INCLUDE_DEPS = YES
NO_INCLUDE_PKGDATA = YES
ifneq "$(findstring clean,$(MAKECMDGOALS))" ""
NO_INCLUDE_DEPS = YES
NO_INCLUDE_PKGDATA = YES
@@
-318,6
+316,16
@@
endif
PACKAGES += haskeline
PACKAGES += haskeline
+ifneq "$(wildcard libraries/dph)" ""
+PACKAGES += \
+ dph/dph-base \
+ dph/dph-prim-interface \
+ dph/dph-prim-seq \
+ dph/dph-prim-par \
+ dph/dph-seq \
+ dph/dph-par
+endif
+
BOOT_PKGS = Cabal hpc extensible-exceptions
# The actual .a and .so/.dll files: needed for dependencies.
BOOT_PKGS = Cabal hpc extensible-exceptions
# The actual .a and .so/.dll files: needed for dependencies.
@@
-517,6
+525,9
@@
$(foreach lib,$(PACKAGES),$(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