[commit: ghc] master: Fix broken build-system when libffi uses install-sh (3e2a4ee)

git at git.haskell.org git at git.haskell.org
Thu Nov 19 12:24:31 UTC 2015


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

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

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

commit 3e2a4eefbed7002437c3f3ee340832a42f0b37f8
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Nov 19 12:21:04 2015 +0100

    Fix broken build-system when libffi uses install-sh
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1494
    
    GHC Trac Issues: #11109


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

3e2a4eefbed7002437c3f3ee340832a42f0b37f8
 libffi/ghc.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index a37e3be..19b6f43 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -79,6 +79,11 @@ $(libffi_STAMP_CONFIGURE): $(TOUCH_DEP)
 	mv libffi/build/Makefile.in libffi/build/Makefile.in.orig
 	sed 's:@toolexeclibdir@:$$(libdir):g' < libffi/build/Makefile.in.orig > libffi/build/Makefile.in
 
+	# 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
+
 # * 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;
 #   hence the -w flags.



More information about the ghc-commits mailing list