X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=881cfc2c2c232a17460b9d257cf7b30ca2a92c06;hb=8ca46317605d42e01562308dbd32dadea6bb780f;hp=82cf02e979269d90c66b9b55319444e0aa988002;hpb=0d126b9c0dc9299a860fc6bb0e1dee05eb583de2;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index 82cf02e..881cfc2 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -12,8 +12,7 @@ TOP=. 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 @@ -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" +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) @@ -56,6 +59,12 @@ endif empty= space=$(empty) $(empty) +ifeq "$(Windows)" "YES" +dot_bat=.bat +else +dot_bat= +endif + CONFIGURE_OPTS = CONFIGURE_STAMP_EXTRAS := @@ -93,7 +102,7 @@ $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \ 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 $@ @@ -122,10 +131,13 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup cd $* && setup/Setup configure \ $(CONFIGURE_OPTS) \ --prefix=$(prefix) \ - --with-compiler=../../compiler/ghc-inplace \ - --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \ + --with-compiler=../../compiler/ghc-inplace$(dot_bat) \ + --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$(dot_bat) \ + --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace$(dot_bat) \ + --with-ld=$(LD) \ --datasubdir=ghc \ - --haddock-args="--use-contents=../index.html --use-index=../doc-index.html" + --haddock-args="--use-contents=../index.html --use-index=../doc-index.html" \ + --configure-option=--with-cc=$(CC) touch $@ $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\