Commit b84da617 authored by Simon Peyton Jones's avatar Simon Peyton Jones

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

parents f3bfbd58 9d33fc3c
......@@ -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.
......
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment