projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0553534
)
Use -fffi when compiling Cabal stuff with the bootstrapping compiler
author
Ian Lynagh
<igloo@earth.li>
Tue, 13 May 2008 21:11:28 +0000
(21:11 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Tue, 13 May 2008 21:11:28 +0000
(21:11 +0000)
libraries/Makefile
patch
|
blob
|
history
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
4168ae5
..
112e9e5
100644
(file)
--- 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.
# 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
$(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)
$(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"
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
--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
--make installPackage -o installPackage \
$(BOOTSTRAP_INC_1_UP)
endif