X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libffi%2Fghc.mk;h=0394d1d38921e98690a2637dc770160117b63c83;hb=97a8fe8780307e95829034117efa98d2e27109cd;hp=fde3a9c781df4ac49e49a043f16e603a4e7a744c;hpb=6ecc80d1c032c48358b9f21480f8e591b27f3212;p=ghc-hetmet.git

diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index fde3a9c..0394d1d 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -119,10 +119,13 @@ $(libffi_STAMP_CONFIGURE):
 	    PATH=`pwd`:$$PATH; \
 	    export PATH; \
 	    cd build && \
-	    CC=$(WhatGccIsCalled) $(SHELL) configure \
-		  --enable-static=yes \
+	    CC=$(WhatGccIsCalled) \
+        CFLAGS="$(SRC_CC_OPTS)" \
+        LDFLAGS="$(SRC_LD_OPTS)" \
+        $(SHELL) configure \
+	          --enable-static=yes \
 	          --enable-shared=$(libffi_EnableShared) \
-		  --host=$(PLATFORM) --build=$(PLATFORM)
+	          --host=$(PLATFORM) --build=$(PLATFORM)
 
 	# libffi.so needs to be built with the correct soname.
 	# NOTE: this builds libffi_convience.so with the incorrect
@@ -163,7 +166,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) -c empty.c -o HSffi.o
+	  $(CC) $(SRC_CC_OPTS) -c empty.c -o HSffi.o
 
 $(eval $(call all-target,libffi,libffi/HSffi.o))