projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't compile Cabal with -cpp -fffi
[ghc-hetmet.git]
/
libraries
/
Makefile
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
9b5c7de
..
0ca6cdd
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-75,6
+75,10
@@
SUBDIRS += $(wildcard ObjectIO)
endif
SUBDIRS += $(wildcard parallel)
SUBDIRS_BUILD += $(wildcard ndp)
endif
SUBDIRS += $(wildcard parallel)
SUBDIRS_BUILD += $(wildcard ndp)
+SUBDIRS_BUILD += $(wildcard dph/dph-base)
+SUBDIRS_BUILD += $(wildcard dph/dph-prim-seq)
+SUBDIRS_BUILD += $(wildcard dph/dph-prim-par)
+SUBDIRS_BUILD += $(wildcard dph/dph)
endif
SUBDIRS += $(SUBDIRS_BUILD)
endif
SUBDIRS += $(SUBDIRS_BUILD)
@@
-164,8
+168,7
@@
boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \
# We ought to be depending on %/Setup.*hs, but make makes that difficult.
# We ought to be depending on %/Setup.*hs, but make makes that difficult.
-# -fffi is only needed for GHC 6.4 at the time of writing
-CABAL_GHC_FLAGS = -Wall -cpp -fffi
+CABAL_GHC_FLAGS = -Wall
$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
%/setup/Setup: $(BOOTSTRAP_STAMPS)
$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
%/setup/Setup: $(BOOTSTRAP_STAMPS)