[commit: ghc] master: Fix installation (6b431ab)
Ian Lynagh
igloo at earth.li
Wed Apr 3 16:06:57 CEST 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : master
https://github.com/ghc/ghc/commit/6b431ab4e108b156d3da01c2b2c97a4313e5ebbb
>---------------------------------------------------------------
commit 6b431ab4e108b156d3da01c2b2c97a4313e5ebbb
Author: Ian Lynagh <ian at well-typed.com>
Date: Wed Apr 3 12:47:36 2013 +0100
Fix installation
The build system thought that the RTS built more library files than
it actually did, and installation failed when we tried to 'strip'
one of these non-existant files.
>---------------------------------------------------------------
rts/ghc.mk | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/rts/ghc.mk b/rts/ghc.mk
index f940e31..4452add 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -547,9 +547,8 @@ rts/package.conf.inplace : $(includes_H_CONFIG) $(includes_H_PLATFORM)
RTS_INSTALL_LIBS += $(ALL_RTS_LIBS)
ifneq "$(UseSystemLibFFI)" "YES"
-RTS_INSTALL_LIBS += $(wildcard rts/dist/build/libffi$(soext)*)
-RTS_INSTALL_LIBS += $(foreach w,$(filter-out dyn,$(rts_WAYS)),rts/dist/build/libCffi$($w_libsuf))
-RTS_INSTALL_LIBS += rts/dist/build/$(LIBFFI_DLL)
+RTS_INSTALL_LIBS += $(wildcard rts/dist/build/libffi*$(soext)*)
+RTS_INSTALL_LIBS += $(foreach w,$(filter-out %dyn,$(rts_WAYS)),rts/dist/build/libCffi$($w_libsuf))
endif
ifneq "$(UseSystemLibFFI)" "YES"
More information about the ghc-commits
mailing list