[commit: integer-gmp] ghc-7.4: Fix building libgmp on cygwin (d95eb88)

Ian Lynagh igloo at earth.li
Fri May 4 00:23:06 CEST 2012


Repository : ssh://darcs.haskell.org//srv/darcs/packages/integer-gmp

On branch  : ghc-7.4

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

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

commit d95eb887c0e8ed012065e2fd60c234a8db0eebf7
Author: Ian Lynagh <igloo at earth.li>
Date:   Fri Mar 16 01:00:30 2012 +0000

    Fix building libgmp on cygwin

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

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

diff --git a/gmp/ghc.mk b/gmp/ghc.mk
index 78dfa8a..8c60e6f 100644
--- a/gmp/ghc.mk
+++ b/gmp/ghc.mk
@@ -125,6 +125,12 @@ libraries/integer-gmp/gmp/libgmp.a libraries/integer-gmp/gmp/gmp.h:
 	cat $(GMP_TARBALL) | $(BZIP2_CMD) -d | { cd libraries/integer-gmp/gmp && $(TAR_CMD) -xf - ; }
 	mv libraries/integer-gmp/gmp/$(GMP_DIR) libraries/integer-gmp/gmp/gmpbuild
 	chmod +x libraries/integer-gmp/gmp/ln
+
+	# Their cmd invocation only works on msys. On cygwin it starts
+	# a cmd interactive shell. The replacement works in both environments.
+	mv libraries/integer-gmp/gmp/gmpbuild/ltmain.sh libraries/integer-gmp/gmp/gmpbuild/ltmain.sh.orig
+	sed 's#cmd //c echo "\$$1"#cmd /c "echo $$1"#' < libraries/integer-gmp/gmp/gmpbuild/ltmain.sh.orig > libraries/integer-gmp/gmp/gmpbuild/ltmain.sh
+
 	cd libraries/integer-gmp/gmp; (set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
 	    PATH=`pwd`:$$PATH; \
 	    export PATH; \





More information about the Cvs-libraries mailing list