[commit: ghc] master: Use the `patch` command detected by the top-level `configure` (a7c2972)

git at git.haskell.org git at git.haskell.org
Mon Nov 24 11:48:27 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a7c29721535d636fb16ab756b3f44224e04a5113/ghc

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

commit a7c29721535d636fb16ab756b3f44224e04a5113
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 24 12:45:42 2014 +0100

    Use the `patch` command detected by the top-level `configure`
    
    ...instead of invoking `patch` directly in `integer-gmp2/gmp/ghc.mk`


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

a7c29721535d636fb16ab756b3f44224e04a5113
 libraries/integer-gmp2/gmp/ghc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/integer-gmp2/gmp/ghc.mk b/libraries/integer-gmp2/gmp/ghc.mk
index 45991d0..2d8aacc 100644
--- a/libraries/integer-gmp2/gmp/ghc.mk
+++ b/libraries/integer-gmp2/gmp/ghc.mk
@@ -113,8 +113,8 @@ libraries/integer-gmp2/gmp/libgmp.a libraries/integer-gmp2/gmp/gmp.h:
 	$(RM) -rf libraries/integer-gmp2/gmp/$(GMP_DIR) libraries/integer-gmp2/gmp/gmpbuild libraries/integer-gmp2/gmp/objs
 	cat $(GMP_TARBALL) | $(BZIP2_CMD) -d | { cd libraries/integer-gmp2/gmp && $(TAR_CMD) -xf - ; }
 	mv libraries/integer-gmp2/gmp/$(GMP_DIR) libraries/integer-gmp2/gmp/gmpbuild
-	cd libraries/integer-gmp2/gmp && patch -p0 < gmpsrc.patch
-	cat libraries/integer-gmp/gmp/tarball/gmp-5.0.4.patch | { cd libraries/integer-gmp2/gmp/gmpbuild && patch -p1 ; }
+	cd libraries/integer-gmp2/gmp && $(PATCH_CMD) -p0 < gmpsrc.patch
+	cat libraries/integer-gmp/gmp/tarball/gmp-5.0.4.patch | { cd libraries/integer-gmp2/gmp/gmpbuild && $(PATCH_CMD) -p1 ; }
 	chmod +x libraries/integer-gmp2/gmp/ln
 
 	# Their cmd invocation only works on msys. On cygwin it starts



More information about the ghc-commits mailing list