projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move the definition of NONEXISTENT into the central cabal-flags.mk
[ghc-hetmet.git]
/
libraries
/
Makefile
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
4a75932
..
d7da0c1
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-70,9
+70,6
@@
SUBDIRS += $(wildcard ALUT)
SUBDIRS += $(wildcard stm)
SUBDIRS += $(wildcard xhtml)
SUBDIRS += $(wildcard cgi)
SUBDIRS += $(wildcard stm)
SUBDIRS += $(wildcard xhtml)
SUBDIRS += $(wildcard cgi)
-ifeq "$(GhcLibsWithObjectIO)" "YES"
-SUBDIRS += $(wildcard ObjectIO)
-endif
SUBDIRS += $(wildcard parallel)
SUBDIRS_BUILD += $(wildcard ndp)
SUBDIRS_BUILD += $(wildcard dph/dph-base)
SUBDIRS += $(wildcard parallel)
SUBDIRS_BUILD += $(wildcard ndp)
SUBDIRS_BUILD += $(wildcard dph/dph-base)
@@
-157,7
+154,6
@@
subdirs:
HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages
HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages
-CABAL=$(HERE_ABS)/cabal-bin $(GHC) $(HERE_ABS)/bootstrapping.conf
CABAL_GHC_FLAGS = -Wall
ifeq "$(ghc_ge_605)" "NO"
CABAL_GHC_FLAGS = -Wall
ifeq "$(ghc_ge_605)" "NO"
@@
-239,12
+235,6
@@
configure: $(foreach SUBDIR,$(SUBDIRS), \
# We should depend on %/%.cabal here (and in other rules), but make
# makes that difficult.
# We should depend on %/%.cabal here (and in other rules), but make
# makes that difficult.
-ifeq "$(Windows)" "YES"
-NONEXISTENT=c:/NONEXISTENT
-else
-NONEXISTENT=/NONEXISTENT
-endif
-
ALL_CONFIGURE_FLAGS = \
$(INSTALL_CONFIGURE_FLAGS) \
--haddock-options="--use-contents=../index.html \
ALL_CONFIGURE_FLAGS = \
$(INSTALL_CONFIGURE_FLAGS) \
--haddock-options="--use-contents=../index.html \