X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libffi%2Fghc.mk;h=7104d046b9e1691f2ef94f7651516789190f20ee;hb=d305c6b68e06368c2a8d89900a2123388fc39ae1;hp=440fc741f94ab63cf74cd05cc82625e35b411216;hpb=142df90ad9ec1155129a01949775bf992c75f08f;p=ghc-hetmet.git

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)