X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=112e9e5f5d903d93ca46700992d52d0d345c32f9;hp=4168ae5f1c7b13ab086bad6d13f75e6dafa9c456;hb=13df6c59f92c81bbb53b8402bd28159faf4758f0;hpb=05535340ae496c57ff218e016da6649ca1640754

diff --git a/libraries/Makefile b/libraries/Makefile
index 4168ae5..112e9e5 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