From 191fd267d54d633b14f26b3788f2811d40e33e9a Mon Sep 17 00:00:00 2001 From: "Ben.Lippmeier@anu.edu.au" Date: Thu, 19 Nov 2009 00:02:39 +0000 Subject: [PATCH] Windows DLLs: Slurp across the actually static version of libffi --- libffi/ghc.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libffi/ghc.mk b/libffi/ghc.mk index 440fc74..7104d04 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -150,9 +150,17 @@ $(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) | 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) -- 1.7.10.4