summaryrefslogtreecommitdiff
path: root/libffi
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-10-06 16:27:37 +0100
committerIan Lynagh <igloo@earth.li>2011-10-06 16:27:37 +0100
commit8838983458628328ab415f53dbfc7a7088083bf4 (patch)
treecb3d00d3a01f4b04b0dfbdcf72af96a89c37cb37 /libffi
parentcd39aea968581ab1d805b8b1195b8f154af9925a (diff)
downloadhaskell-8838983458628328ab415f53dbfc7a7088083bf4.tar.gz
Build fixes for OS X amd64 following libffi update
Diffstat (limited to 'libffi')
-rw-r--r--libffi/ghc.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index 9dcf2c54a3..3aa1cbc296 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -137,6 +137,11 @@ $(libffi_STAMP_CONFIGURE):
"$(CP)" build/libtool build/libtool.orig && \
sed -e s/dlname=\'\$$tdlname\'/dlname=\'\$$dlname\'/ build/libtool.orig > build/libtool
+ # wc on OS X has spaces in its output, which libffi's Makefile
+ # doesn't expect, so we tweak it to sed them out
+ mv libffi/build/Makefile libffi/build/Makefile.orig
+ sed "s#wc -w#wc -w | sed 's/ //g'#" < libffi/build/Makefile.orig > libffi/build/Makefile
+
touch $@
libffi/dist-install/build/ffi.h: $(libffi_STAMP_CONFIGURE) libffi/dist-install/build/ffitarget.h | $$(dir $$@)/.