X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=40374ce72e788333d7a1d971ebdfd4f7101e681a;hp=29079961f37cd368219b8c4114c572dd7a318230;hb=305eb36d92e373eb3cd4803ee89c2cc8f23a5fc0;hpb=4e0972788c3a67337b1671e46692fbf18c5f504d

diff --git a/libraries/Makefile b/libraries/Makefile
index 2907996..40374ce 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -163,12 +163,15 @@ boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \
 
 # We ought to be depending on %/Setup.*hs, but make makes that difficult.
 
+# -fffi is only needed for GHC 6.4 at the time of writing
+CABAL_GHC_FLAGS = -Wall -cpp -fffi
+
 $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
 %/setup/Setup: $(BOOTSTRAP_STAMPS)
 	-$(RM) -rf $*/setup
 	mkdir $*/setup
 	$(CP) $*/Setup.*hs $*/setup
-	cd $*/setup && $(GHC) -Wall -cpp --make Setup.*hs -o Setup \
+	cd $*/setup && $(GHC) $(CABAL_GHC_FLAGS) --make Setup.*hs -o Setup \
 	                      $(BOOTSTRAP_INC_2_UP)
 
 installPackage/installPackage: installPackage.hs $(BOOTSTRAP_STAMPS)
@@ -176,11 +179,11 @@ installPackage/installPackage: installPackage.hs $(BOOTSTRAP_STAMPS)
 	mkdir installPackage
 	$(CP) installPackage.hs installPackage/
 ifeq "$(stage)" "2"
-	cd installPackage && ../$(HC) -Wall -cpp \
+	cd installPackage && ../$(HC) $(CABAL_GHC_FLAGS) \
 	                            --make installPackage -o installPackage \
 	                            $(BOOTSTRAP_INC_1_UP) $(DEPLOYMENT_OPTS)
 else
-	cd installPackage && $(GHC) -Wall -cpp \
+	cd installPackage && $(GHC) $(CABAL_GHC_FLAGS) \
 	                            --make installPackage -o installPackage \
 	                            $(BOOTSTRAP_INC_1_UP)
 endif
@@ -246,17 +249,23 @@ FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
                                  $(space)--configure-option=',\
                                  $(space)$(CONFIGURE_ARGS))
 
+ifeq "$(Windows)" "YES"
+NONEXISTENT=c:/NONEXISTENT
+else
+NONEXISTENT=/NONEXISTENT
+endif
+
 ALL_CONFIGURE_FLAGS = \
 	           $(CONFIGURE_OPTS) \
-	           --prefix=/NONEXISTANT \
-	           --bindir=/NONEXISTANT \
-	           --libdir=/NONEXISTANT \
+	           --prefix=$(NONEXISTENT) \
+	           --bindir=$(NONEXISTENT) \
+	           --libdir=$(NONEXISTENT) \
 	           --libsubdir='$$pkgid' \
-	           --libexecdir=/NONEXISTANT \
-	           --datadir=/NONEXISTANT \
-	           --docdir=/NONEXISTANT \
-			   --haddockdir=/NONEXISTANT \
-	           --htmldir=/NONEXISTANT \
+	           --libexecdir=$(NONEXISTENT) \
+	           --datadir=$(NONEXISTENT) \
+	           --docdir=$(NONEXISTENT) \
+			   --haddockdir=$(NONEXISTENT) \
+	           --htmldir=$(NONEXISTENT) \
 	           --with-compiler=../../compiler/stage1/ghc-inplace \
 	           --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \
 	           --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \
@@ -302,6 +311,7 @@ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
 	if ifBuildable/ifBuildable $*; then \
 	  cd $* && \
 	  setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \
+	  ../installPackage/installPackage register --inplace; \
 	fi
 
 .PHONY: doc html