X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libffi%2Fghc.mk;h=a1c274828a195de3db1a780d767538660d8f65e2;hb=80aea54a820cd718d47ff43b6988d2ea3ed615ae;hp=d3e57be93ad0db88ba79dd5127dc81213e9c620a;hpb=e6ca2d4ac1e3d86bd93e5884fbae03151c708862;p=ghc-hetmet.git

diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index d3e57be..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