[commit: ghc] master: Follow-up fix to 3e2a4eefbed7002437c3f (re #11109) (4976ab2)
git at git.haskell.org
git at git.haskell.org
Sun Nov 22 08:41:54 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/4976ab2bd333e28a1d4cfe924d4d8ebb49489366/ghc
>---------------------------------------------------------------
commit 4976ab2bd333e28a1d4cfe924d4d8ebb49489366
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date: Sun Nov 22 09:38:38 2015 +0100
Follow-up fix to 3e2a4eefbed7002437c3f (re #11109)
Using `:` as sed-`s`-expr separator is not a good idea on windows, as
this can result in an expression like
's:@INSTALL@:$(subst ../install-sh,E:/msys64/home/foo/ghc/install-sh, at INSTALL@):g'
(note the `E:/` drive component)
Using `|` instead of `:` has less risk of collision with the substitution expression
>---------------------------------------------------------------
4976ab2bd333e28a1d4cfe924d4d8ebb49489366
libffi/ghc.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index 19b6f43..a25dbf0 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -82,7 +82,7 @@ $(libffi_STAMP_CONFIGURE): $(TOUCH_DEP)
# install-sh is used when /usr/bin/install is missing; ensure its
# path in libffi's Makefile is correct. See GHC #11109.
mv libffi/build/Makefile.in libffi/build/Makefile.in.orig
- sed 's:@INSTALL@:$$(subst ../install-sh,$(TOP)/install-sh, at INSTALL@):g' < libffi/build/Makefile.in.orig > libffi/build/Makefile.in
+ sed 's|@INSTALL@|$$(subst ../install-sh,$(TOP)/install-sh, at INSTALL@)|g' < libffi/build/Makefile.in.orig > libffi/build/Makefile.in
# * 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;
More information about the ghc-commits
mailing list