X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=881cfc2c2c232a17460b9d257cf7b30ca2a92c06;hb=8ca46317605d42e01562308dbd32dadea6bb780f;hp=594de168e470ae6ae9b3c34fef01e4b5945c36e0;hpb=80a290e38a1d53f8db2120dc40f362e5e4498ce6;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 594de16..881cfc2 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -3,11 +3,16 @@
 
 default_target: build
 
+ifeq "$(IN_BIN_DIST)" "1"
+include ../Makefile-vars
+else
+# Ideally we'd just include something to give us variables
+# for paths and arguments to tools etc, and those set in mk/build.mk.
 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
@@ -19,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)
@@ -50,6 +59,12 @@ endif
 empty=
 space=$(empty) $(empty)
 
+ifeq "$(Windows)" "YES"
+dot_bat=.bat
+else
+dot_bat=
+endif
+
 CONFIGURE_OPTS =
 CONFIGURE_STAMP_EXTRAS :=
 
@@ -60,6 +75,11 @@ endif
 
 BOOTSTRAPPING_CABAL = bootstrapping.cabal
 
+.PHONY: subdirs
+
+subdirs:
+	@echo $(SUBDIRS)
+
 .PHONY: boot
 
 boot: $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup)
@@ -82,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 $@
 
@@ -111,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)):\
@@ -135,7 +158,7 @@ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                %/setup/Setup
 	cd $* && setup/Setup haddock
 
-.PHONY: install.library.%
+.PHONY: install install-docs install.library.%
 
 INSTALL_DIR=$(prefix)/share/ghc/doc/html/
 
@@ -147,6 +170,10 @@ install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR))
 	$(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.js  $(INSTALL_DIR)
 	$(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.gif $(INSTALL_DIR)
 
+# Cabal doesn't let us ask to install docs only, so do nothing here
+install-docs:
+	@:
+
 # Ideally this would depend on a stamp/build.library.%, but if it does
 # then we can't change the libraries and then just rerun make.
 # Thus if you install without building then it will just break.