Skip to content
Browse files

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

  • Loading branch information...
2 parents f3bfbd5 + 9d33fc3 commit b84da617c4dadcfbf47796e7a75c21d6b4c4947a @simonpj simonpj committed Apr 3, 2013
Showing with 3 additions and 4 deletions.
  1. +1 −1 mk/build.mk.sample
  2. +2 −3 rts/ghc.mk
View
2 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.
View
5 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"

0 comments on commit b84da61

Please sign in to comment.
Something went wrong with that request. Please try again.