After the libffi 3.0.10 update, my Windows build hung due to the way the
libtool script invokes cmd. After fixing that, it still failed because it was
looking for libffi_convenience.a in the wrong place. This patch fixes both
issues for me and allows the build to succeed. Hopefully this will point
someone more familiar with the win32 build in the right direction.
Geoff
---
libffi/ghc.mk | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index 3aa1cbc..ce384d2 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -123,7 +123,10 @@ $(libffi_STAMP_CONFIGURE):
--enable-shared=$(libffi_EnableShared) \
--host=$(HOSTPLATFORM) --build=$(BUILDPLATFORM)
- cp libffi/build/*/libtool libffi/build
+ "$(CP)" libffi/build/$(BUILDPLATFORM)/libtool
libffi/build/$(BUILDPLATFORM)/libtool.orig && \
+ sed -e "s|cmd //c|cmd /C|"
libffi/build/$(BUILDPLATFORM)/libtool.orig >
libffi/build/$(BUILDPLATFORM)/libtool
+
+ cp libffi/build/$(BUILDPLATFORM)/libtool libffi/build
# libffi.so needs to be built with the correct soname.
# NOTE: this builds libffi_convience.so with the incorrect
@@ -157,7 +160,7 @@ $(libffi_STAMP_BUILD): $(libffi_STAMP_CONFIGURE) |
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)
+ cp libffi/build/$(BUILDPLATFORM)/.libs/libffi_convenience.a
$(libffi_STATIC_LIB)
endif
touch $@
--
1.7.5.1
_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc
