projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5e4597f
)
Windows DLLs: Slurp across the actually static version of libffi
author
Ben.Lippmeier@anu.edu.au
<unknown>
Thu, 19 Nov 2009 00:02:39 +0000
(
00:02
+0000)
committer
Ben.Lippmeier@anu.edu.au
<unknown>
Thu, 19 Nov 2009 00:02:39 +0000
(
00:02
+0000)
libffi/ghc.mk
patch
|
blob
|
history
diff --git
a/libffi/ghc.mk
b/libffi/ghc.mk
index
440fc74
..
7104d04
100644
(file)
--- 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/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
$(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)
touch $@
$(libffi_STATIC_LIB): $(libffi_STAMP_BUILD)