summaryrefslogtreecommitdiff
path: root/libffi
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-11-30 17:53:08 +0000
committerIan Lynagh <igloo@earth.li>2011-11-30 17:53:08 +0000
commitcdbb4720c424500adb57cbbef69721d0b039fa46 (patch)
treef555381e42fa05ab9a0323014561668e8c5e50c3 /libffi
parentf85c084c0d6e8f7ac8b282220eb93c69e356b5e1 (diff)
downloadhaskell-cdbb4720c424500adb57cbbef69721d0b039fa46.tar.gz
Fix cmd invocation by libffi cuild system on Windows 7 cygwin
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 4b35f0a6a7..8162c81874 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -61,6 +61,11 @@ $(libffi_STAMP_CONFIGURE):
mv libffi/build/Makefile.in libffi/build/Makefile.in.orig
sed "s/-MD/-MMD/" < libffi/build/Makefile.in.orig > libffi/build/Makefile.in
+ # Their cmd invocation only works on msys. On cygwin it starts
+ # a cmd interactive shell. The replacement works in both environments.
+ mv libffi/build/ltmain.sh libffi/build/ltmain.sh.orig
+ sed 's#cmd //c echo "\$$1"#cmd /c "echo $$1"#' < libffi/build/ltmain.sh.orig > libffi/build/ltmain.sh
+
# Because -Werror may be in SRC_CC_OPTS/SRC_LD_OPTS, we need to turn
# warnings off or the compilation of libffi might fail due to warnings
cd libffi && \