Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/cdbb4720c424500adb57cbbef69721d0b039fa46

>---------------------------------------------------------------

commit cdbb4720c424500adb57cbbef69721d0b039fa46
Author: Ian Lynagh <[email protected]>
Date:   Wed Nov 30 17:53:08 2011 +0000

    Fix cmd invocation by libffi cuild system on Windows 7 cygwin

>---------------------------------------------------------------

 libffi/ghc.mk |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index 4b35f0a..8162c81 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 && \



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to