X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=1fef7e3893ed6067876649d7093318a5211f39f3;hb=dce65c102b136ee9eb57fadf4cc3fd7a8931d074;hp=c1a3d2f928e42542cc1a306850748548a7928910;hpb=c46a09eb4696fbd89fc7c8c1c2043d6da572326b;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index c1a3d2f..1fef7e3 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -195,6 +195,12 @@ else
 libsubdir = $$compiler/lib/$$pkgid
 endif
 
+# We rely on all the CONFIGURE_ARGS being quoted with '...', and there
+# being no 's inside the values.
+FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
+                                 $(space)--configure-option=',\
+                                 $(space)$(CONFIGURE_ARGS))
+
 $(foreach SUBDIR,$(SUBDIRS), \
 		  stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
 stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
@@ -204,14 +210,14 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 	           --prefix='$$topdir' \
 	           --datadir='$$prefix/share' \
 	           --libsubdir='$(libsubdir)' \
-	           --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-compiler=../../compiler/stage1/ghc-inplace$ \
+	           --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \
+	           --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \
 	           --with-ld=$(LD) \
 	           --datasubdir=ghc \
 	           --haddock-args="--use-contents=../index.html \
 	                           --use-index=../doc-index.html" \
-	           $(addprefix --configure-option=,$(CONFIGURE_ARGS)) \
+	           $(FLAGGED_CONFIGURE_ARGS) \
 	           --configure-option=--with-cc=$(CC) ) \
 	      && touch $@ || touch $*/unbuildable
 # We don't touch $@ if configure failed as we would prefer to try
@@ -224,10 +230,7 @@ $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\
 make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
 		%/GNUmakefile \
                 %/setup/Setup ifBuildable/ifBuildable
-#       HACK: invoke make via $(SHELL), otherwise on Windows it apparently
-#       gets argv[0] set to "make" (with quotes), which causes a problem
-#       when make re-invokes itself after creating .depend.  Ugh.
-	ifBuildable/ifBuildable $* $(SHELL) -c $(MAKE)
+	ifBuildable/ifBuildable $* $(MAKE)
 	ifBuildable/ifBuildable $* setup/Setup register --inplace
 
 # Build the library using 'setup build' (not the default)