diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-11-19 12:21:04 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2015-11-19 13:24:32 +0100 |
| commit | 3e2a4eefbed7002437c3f3ee340832a42f0b37f8 (patch) | |
| tree | c9e7678aa490c3e8224388c6a29ec707e407f8e5 /libffi | |
| parent | 2442038554440923179d532137199d5290875cff (diff) | |
| download | haskell-3e2a4eefbed7002437c3f3ee340832a42f0b37f8.tar.gz | |
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
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ghc.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk index a37e3becfd..19b6f439d0 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,@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. |