Fix installation
authorIan Lynagh <ian@well-typed.com>
Wed, 3 Apr 2013 11:47:36 +0000 (12:47 +0100)
committerIan Lynagh <ian@well-typed.com>
Wed, 3 Apr 2013 11:47:36 +0000 (12:47 +0100)
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

index f940e31..4452add 100644 (file)
@@ -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 += $(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"
 endif
 
 ifneq "$(UseSystemLibFFI)" "YES"