summaryrefslogtreecommitdiff
path: root/libffi
diff options
context:
space:
mode:
authorManuel M T Chakravarty <chak@cse.unsw.edu.au>2009-09-17 13:27:06 +0000
committerManuel M T Chakravarty <chak@cse.unsw.edu.au>2009-09-17 13:27:06 +0000
commite6ca2d4ac1e3d86bd93e5884fbae03151c708862 (patch)
tree79fe947969b5ff733634f2e1a619daeba07a453d /libffi
parentf35b012e13cea7815831973fbdb6b5e974973cd3 (diff)
downloadhaskell-e6ca2d4ac1e3d86bd93e5884fbae03151c708862.tar.gz
Use CONF_CC_OPTS
- Needed to get arch-dependent options, eg, on Snow Leopard
Diffstat (limited to 'libffi')
-rw-r--r--libffi/ghc.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index ae41881f09..d3e57be93a 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -122,8 +122,8 @@ $(libffi_STAMP_CONFIGURE):
export PATH; \
cd build && \
CC=$(WhatGccIsCalled) \
- CFLAGS="$(SRC_CC_OPTS) -w" \
- LDFLAGS="$(SRC_LD_OPTS) -w" \
+ CFLAGS="$(SRC_CC_OPTS) $(CONF_CC_OPTS) -w" \
+ LDFLAGS="$(SRC_LD_OPTS) $(CONF_LD_OPTS) -w" \
"$(SHELL)" configure \
--enable-static=yes \
--enable-shared=$(libffi_EnableShared) \
@@ -168,7 +168,7 @@ $(eval $(call all-target,libffi,libffi/libHSffi.a libffi/libHSffi_p.a))
libffi/HSffi.o: libffi/libHSffi.a
cd libffi && \
touch empty.c; \
- "$(CC)" $(SRC_CC_OPTS) -c empty.c -o HSffi.o
+ "$(CC)" $(SRC_CC_OPTS) $(CONF_CC_OPTS) -c empty.c -o HSffi.o
$(eval $(call all-target,libffi,libffi/HSffi.o))