X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libffi%2Fghc.mk;h=440b1ef8939b461079021026e67e9aadcdfbf493;hb=79957d77c1bff767f1041d3fabdeb94d92a52878;hp=92e11dddfa990c7e85b742eb17e3ec8c6f55ac25;hpb=3e18f8be62b06c846b52d79717f79d51e2060593;p=ghc-hetmet.git

diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index 92e11dd..440b1ef 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -66,7 +66,8 @@ endif
 
 BINDIST_STAMPS = libffi/stamp.ffi.build libfii/stamp.ffi.configure
 
-INSTALL_HEADERS   += libffi/dist-install/build/ffi.h
+INSTALL_HEADERS   += libffi/dist-install/build/ffi.h \
+		     libffi/dist-install/build/ffitarget.h
 libffi_STATIC_LIB  = libffi/dist-install/build/libffi.a
 INSTALL_LIBS      += libffi/dist-install/build/libHSffi.a \
                      libffi/dist-install/build/libHSffi_p.a \
@@ -88,8 +89,7 @@ ifeq "$(darwin_TARGET_OS)" "1"
 libffi_DYNAMIC_LIBS = libffi/libffi$(soext) libffi/libffi.5$(soext) libffi/libffi.5.0.9$(soext)
 else
 libffi_DYNAMIC_LIBS = libffi/dist-install/build/libffi.so \
-                      libffi/dist-install/build/libffi.so.5 \
-                      libffi/dist-install/build/libffi.so.5.0.9
+                      libffi/dist-install/build/libffi.so.5
 endif
 endif
 
@@ -114,7 +114,7 @@ endif
 ifneq "$(BINDIST)" "YES"
 $(libffi_STAMP_CONFIGURE):
 	"$(RM)" $(RM_OPTS) -r $(LIBFFI_DIR) libffi/build
-	cd libffi && $(TAR) -zxf ../ghc-tarballs/libffi/libffi*.tar.gz
+	cat ghc-tarballs/libffi/libffi*.tar.gz | $(GZIP) -d | { cd libffi && $(TAR) -xf - ; }
 	mv libffi/libffi-* libffi/build
 	chmod +x libffi/ln
 	cd libffi/build && "$(PATCH)" -p1 < ../libffi.dllize-3.0.8.patch
@@ -154,6 +154,8 @@ $(libffi_STAMP_CONFIGURE):
 libffi/dist-install/build/ffi.h: $(libffi_STAMP_CONFIGURE) | $$(dir $$@)/.
 	"$(CP)" libffi/build/include/ffi.h $@
 
+libffi/dist-install/build/ffitarget.h: $(libffi_STAMP_CONFIGURE) | $$(dir $$@)/.
+	"$(CP)" libffi/build/include/ffitarget.h $@
 
 $(libffi_STAMP_BUILD): $(libffi_STAMP_CONFIGURE) | libffi/dist-install/build/.
 	$(MAKE) -C libffi/build MAKEFLAGS=