X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=e0ecc624d96f150951d3c1b5b83f1298e13f6809;hb=301c6bce3c55e35d57e35b25fe388740621ef7d0;hp=82cf02e979269d90c66b9b55319444e0aa988002;hpb=0d126b9c0dc9299a860fc6bb0e1dee05eb583de2;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 82cf02e..e0ecc62 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -56,6 +56,12 @@ endif
 empty=
 space=$(empty) $(empty)
 
+ifeq "$(Windows)" "YES"
+dot_bat=.bat
+else
+dot_bat=
+endif
+
 CONFIGURE_OPTS =
 CONFIGURE_STAMP_EXTRAS :=
 
@@ -93,7 +99,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 +128,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)):\