projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
parsec, regex-base, regex-compat, regex-posix are no longer core-packages
[ghc-hetmet.git]
/
libraries
/
Makefile
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
694adae
..
881cfc2
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-12,8
+12,7
@@
TOP=.
include $(TOP)/mk/boilerplate.mk
endif
include $(TOP)/mk/boilerplate.mk
endif
-SUBDIRS = base filepath haskell98 template-haskell readline \
- regex-base regex-posix regex-compat parsec Cabal
+SUBDIRS = base filepath haskell98 template-haskell readline Cabal
ifeq "$(GhcLibsWithUnix)" "YES"
SUBDIRS += unix
ifeq "$(GhcLibsWithUnix)" "YES"
SUBDIRS += unix
@@
-25,6
+24,10
@@
endif
# Set GhcBootLibs=YES from the command line to work with just the libraries
# needed to bootstrap GHC.
ifneq "$(GhcBootLibs)" "YES"
# Set GhcBootLibs=YES from the command line to work with just the libraries
# needed to bootstrap GHC.
ifneq "$(GhcBootLibs)" "YES"
+SUBDIRS += $(wildcard regex-base)
+SUBDIRS += $(wildcard regex-posix)
+SUBDIRS += $(wildcard regex-compat)
+SUBDIRS += $(wildcard parsec)
SUBDIRS += $(wildcard haskell-src)
SUBDIRS += $(wildcard html)
SUBDIRS += $(wildcard network)
SUBDIRS += $(wildcard haskell-src)
SUBDIRS += $(wildcard html)
SUBDIRS += $(wildcard network)
@@
-99,7
+102,7
@@
$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
stamp/$(BOOTSTRAPPING_CABAL):
$(RM) -rf $(BOOTSTRAPPING_CABAL)
stamp/$(BOOTSTRAPPING_CABAL):
$(RM) -rf $(BOOTSTRAPPING_CABAL)
- $(CP) -a Cabal $(BOOTSTRAPPING_CABAL)
+ $(CP) -R Cabal $(BOOTSTRAPPING_CABAL)
$(FIND) $(BOOTSTRAPPING_CABAL) \( -name "*.o" -o -name "*.hi" \) -exec $(RM) -f {} \;
touch $@
$(FIND) $(BOOTSTRAPPING_CABAL) \( -name "*.o" -o -name "*.hi" \) -exec $(RM) -f {} \;
touch $@