diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-11-22 09:38:38 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-11-22 09:41:49 +0100 |
| commit | 4976ab2bd333e28a1d4cfe924d4d8ebb49489366 (patch) | |
| tree | 14a144fbf5e7190a10cf3a2b8d043fe46a72b18e /libffi | |
| parent | a703fbce20969e6f02e74fee76c0a9e22b513426 (diff) | |
| download | haskell-4976ab2bd333e28a1d4cfe924d4d8ebb49489366.tar.gz | |
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,@INSTALL@):g'
(note the `E:/` drive component)
Using `|` instead of `:` has less risk of collision with the substitution expression
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ghc.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk index 19b6f439d0..a25dbf0fe8 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,@INSTALL@):g' < libffi/build/Makefile.in.orig > libffi/build/Makefile.in + sed 's|@INSTALL@|$$(subst ../install-sh,$(TOP)/install-sh,@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; |