Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc

mk/build.mk.sample

@@ -33,7 +33,7 @@
 # A development build, working on the stage 2 compiler:
 #BuildFlavour = devel2
 
-GhcLibWays = $(if $(filter $(DYNAMIC_GHC_PROGRAMS),YES),dyn,v)
+GhcLibWays = $(if $(filter $(DYNAMIC_GHC_PROGRAMS),YES),v dyn,v)
 
 # Uncomment this to get prettier build output.
 # Please use V = 1 when reporting GHC bugs.

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"