X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libffi%2Fghc.mk;h=a1c274828a195de3db1a780d767538660d8f65e2;hb=6cf8982ac30be6836a0cdd8be5a6ac1a1a144213;hp=ae41881f090dd4d1504e5d57fe4397acb63bf8fd;hpb=00d2c6d9c820e75bf71bacb3af69bfa92423644e;p=ghc-hetmet.git

diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index ae41881..a1c2748 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -68,7 +68,7 @@ BINDIST_STAMPS = libffi/stamp.ffi.build libfii/stamp.ffi.configure
 
 INSTALL_HEADERS   += libffi/ffi.h
 libffi_STATIC_LIB  = libffi/libffi.a
-INSTALL_LIBS      += libffi/libHSffi.a libffi/HSffi.o
+INSTALL_LIBS      += libffi/libHSffi.a libffi/libHSffi_p.a libffi/HSffi.o
 
 # We have to add the GHC version to the name of our dynamic libs, because
 # they will be residing in the system location along with dynamic libs from
@@ -106,7 +106,7 @@ endif
 ifneq "$(BINDIST)" "YES"
 $(libffi_STAMP_CONFIGURE):
 	"$(RM)" $(RM_OPTS) -r $(LIBFFI_DIR) libffi/build
-	cd libffi && $(TAR) -zxf tarball/libffi*.tar.gz
+	cd libffi && $(TAR) -zxf ../ghc-tarballs/libffi/libffi*.tar.gz
 	mv libffi/libffi-* libffi/build
 	chmod +x libffi/ln
 	cd libffi/build && "$(PATCH)" -p1 < ../libffi.dllize-3.0.8.patch
@@ -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))