diff options
| author | Ben.Lippmeier@anu.edu.au <unknown> | 2009-11-19 00:02:39 +0000 |
|---|---|---|
| committer | Ben.Lippmeier@anu.edu.au <unknown> | 2009-11-19 00:02:39 +0000 |
| commit | 191fd267d54d633b14f26b3788f2811d40e33e9a (patch) | |
| tree | 43db7768860768f71a9dc73184ab778cbcb55107 /libffi/ghc.mk | |
| parent | 5e4597f7ab70895496a26c30aadf11353c3928d2 (diff) | |
| download | haskell-191fd267d54d633b14f26b3788f2811d40e33e9a.tar.gz | |
Windows DLLs: Slurp across the actually static version of libffi
Diffstat (limited to 'libffi/ghc.mk')
| -rw-r--r-- | libffi/ghc.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk index 440fc741f9..7104d046b9 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) |