[commit: ghc] master: Link in-tree libffi to rts. Fixes trac #5743. (7ee5bed)
Ian Lynagh <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/7ee5bedc5e5039c9bb3ba06b50a4395e579a4b0e >--------------------------------------------------------------- commit 7ee5bedc5e5039c9bb3ba06b50a4395e579a4b0e Author: Peter Trommler <[email protected]> Date: Fri Nov 30 13:40:10 2012 +0100 Link in-tree libffi to rts. Fixes trac #5743. >--------------------------------------------------------------- rts/ghc.mk | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/rts/ghc.mk b/rts/ghc.mk index e3c9fa6..d605dff 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -194,6 +194,12 @@ $$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend rts/dist/b "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \ -no-auto-link-packages -Lrts/dist/build -l$(LIBFFI_WINDOWS_LIB) `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@ else +ifneq "$(UseSystemLibFFI)" "YES" +LIBFFI_LIBS = -Lrts/dist/build -lffi +else +# flags will be taken care of in rts/libs.depend +LIBFFI_LIBS = +endif $$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend $$(rts_dist_FFI_SO) "$$(RM)" $$(RM_OPTS) $$@ "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \