X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libffi%2Fghc.mk;h=3e00db2f5fd5eeac20e21cc3821cf30d2a5952c3;hb=979c11345ee532a4fc56aab54f51d2924c0ea841;hp=a1c274828a195de3db1a780d767538660d8f65e2;hpb=e51cdf9b6e54fb4052e46b6d7afb15e062928467;p=ghc-hetmet.git

diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index a1c2748..3e00db2 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -66,23 +66,31 @@ endif
 
 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/libHSffi_p.a libffi/HSffi.o
+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 \
+                     libffi/dist-install/build/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
 # other GHC installations.
 
 libffi_HS_DYN_LIB_NAME = libHSffi$(dyn_libsuf)
-libffi_HS_DYN_LIB      = libffi/$(libffi_HS_DYN_LIB_NAME)
+libffi_HS_DYN_LIB      = libffi/dist-install/build/$(libffi_HS_DYN_LIB_NAME)
 
 ifeq "$(Windows)" "YES"
 libffi_DYNAMIC_PROG = $(libffi_HS_DYN_LIB).a
 libffi_DYNAMIC_LIBS = $(libffi_HS_DYN_LIB)
 else
 libffi_DYNAMIC_PROG =
-libffi_DYNAMIC_LIBS = libffi/libffi.so libffi/libffi.so.5 libffi/libffi.so.5.0.9
+ifeq "$(darwin_TARGET_OS)" "1"
+libffi_DYNAMIC_LIBS = libffi/dist-install/build/libffi$(soext) libffi/dist-install/build/libffi.5$(soext) libffi/dist-install/build/libffi.5.0.9$(soext)
+else
+libffi_DYNAMIC_LIBS = libffi/dist-install/build/libffi.so \
+                      libffi/dist-install/build/libffi.so.5
+endif
 endif
 
 ifeq "$(BuildSharedLibs)" "YES"
@@ -106,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
@@ -143,34 +151,43 @@ $(libffi_STAMP_CONFIGURE):
 
 	touch $@
 
-libffi/ffi.h: $(libffi_STAMP_CONFIGURE)
+libffi/dist-install/build/ffi.h: $(libffi_STAMP_CONFIGURE) | $$(dir $$@)/.
 	"$(CP)" libffi/build/include/ffi.h $@
 
-$(libffi_STAMP_BUILD): $(libffi_STAMP_CONFIGURE)
-	cd libffi && \
-	  $(MAKE) -C build MAKEFLAGS=; \
-	  (cd build; ./libtool --mode=install cp libffi.la $(TOP)/libffi)
+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=
+	cd libffi/build && ./libtool --mode=install cp libffi.la $(TOP)/libffi/dist-install/build
+
+	# We actually want both static and dllized libraries, because we build
+	#   the runtime system both ways. libffi_convenience.a is the static version.
+ifeq "$(Windows)" "YES"
+	cp libffi/build/.libs/libffi_convenience.a $(libffi_STATIC_LIB)
+endif
+
 	touch $@
 
 $(libffi_STATIC_LIB): $(libffi_STAMP_BUILD)
 # Rename libffi.a to libHSffi.a
-libffi/libHSffi.a libffi/libHSffi_p.a: $(libffi_STATIC_LIB)
-	"$(CP)" $(libffi_STATIC_LIB) libffi/libHSffi.a
-	"$(CP)" $(libffi_STATIC_LIB) libffi/libHSffi_p.a
+libffi/dist-install/build/libHSffi.a libffi/dist-install/build/libHSffi_p.a: $(libffi_STATIC_LIB)
+	"$(CP)" $(libffi_STATIC_LIB) libffi/dist-install/build/libHSffi.a
+	"$(CP)" $(libffi_STATIC_LIB) libffi/dist-install/build/libHSffi_p.a
 
-$(eval $(call all-target,libffi,libffi/libHSffi.a libffi/libHSffi_p.a))
+$(eval $(call all-target,libffi,$(INSTALL_HEADERS) $(INSTALL_LIBS)))
 
 # The GHCi import lib isn't needed as compiler/ghci/Linker.lhs + rts/Linker.c
 # link the interpreted references to FFI to the compiled FFI.
 # Instead of adding libffi to the list preloaded packages (see
 # compiler/ghci/Linker.lhs:emptyPLS) we generate an empty HSffi.o
 
-libffi/HSffi.o: libffi/libHSffi.a
-	cd libffi && \
-	  touch empty.c; \
+libffi/dist-install/build/HSffi.o: libffi/dist-install/build/libHSffi.a
+	cd libffi/dist-install/build && \
+	  touch empty.c && \
 	  "$(CC)" $(SRC_CC_OPTS) $(CONF_CC_OPTS) -c empty.c -o HSffi.o
 
-$(eval $(call all-target,libffi,libffi/HSffi.o))
+$(eval $(call all-target,libffi,libffi/dist-install/build/HSffi.o))
 
 ifeq "$(BuildSharedLibs)" "YES"
 ifeq "$(Windows)" "YES"
@@ -179,27 +196,27 @@ libffi/libffi.dll.a $(libffi_HS_DYN_LIB): $(libffi_STAMP_BUILD)
 # there is no need to copy from libffi.dll to libHSffi...dll.
 # However, the renaming is still required for the import library
 # libffi.dll.a.
-$(libffi_HS_DYN_LIB).a: libffi/libffi.dll.a
-	"$(CP)" libffi/libffi.dll.a $(libffi_HS_DYN_LIB).a
+$(libffi_HS_DYN_LIB).a: libffi/dist-install/build/libffi.dll.a | $$(dir $$@)/.
+	"$(CP)" $< $@
 
 $(eval $(call all-target,libffi,$(libffi_HS_DYN_LIB).a))
 
 else
 $(libffi_DYNAMIC_LIBS): $(libffi_STAMP_BUILD)
 # Rename libffi.so to libHSffi...so
-$(libffi_HS_DYN_LIB): $(libffi_DYNAMIC_LIBS)
+$(libffi_HS_DYN_LIB): $(libffi_DYNAMIC_LIBS) | $$(dir $$@)/.
 	"$(CP)" $(word 1,$(libffi_DYNAMIC_LIBS)) $(libffi_HS_DYN_LIB)
+ifeq "$(darwin_TARGET_OS)" "1"
+	# Ensure library's install name is correct before anyone links with it.
+	install_name_tool -id $(ghclibdir)/$(libffi_HS_DYN_LIB_NAME) $(libffi_HS_DYN_LIB)
+endif
 
 $(eval $(call all-target,libffi,$(libffi_HS_DYN_LIB)))
 endif
 endif
 
 $(eval $(call clean-target,libffi,, \
-   libffi/build libffi/stamp.ffi.* libffi/ffi.h libffi/empty.c \
-   libffi/libffi.a libffi/libffi.la \
-   libffi/HSffi.o libffi/libHSffi.a libffi/libHSffi_p.a \
-   $(libffi_DYNAMIC_PROG) $(libffi_DYNAMIC_LIBS) \
-   $(libffi_HS_DYN_LIB) $(libffi_HS_DYN_LIB).a))
+   libffi/build libffi/stamp.ffi.* libffi/dist-install))
 endif
 
 #-----------------------------------------------------------------------------