diff options
| author | Peter Trommler <ptrommler@acm.org> | 2012-11-30 13:40:10 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-11-30 13:17:02 +0000 |
| commit | 7ee5bedc5e5039c9bb3ba06b50a4395e579a4b0e (patch) | |
| tree | 86a2b404ddc40c9042420084d7fdfdc358bc53d4 /rts/ghc.mk | |
| parent | 0bb2274f678678791247c8afec12eb9208f6b379 (diff) | |
| download | haskell-7ee5bedc5e5039c9bb3ba06b50a4395e579a4b0e.tar.gz | |
Link in-tree libffi to rts. Fixes trac #5743.
Diffstat (limited to 'rts/ghc.mk')
| -rw-r--r-- | rts/ghc.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/rts/ghc.mk b/rts/ghc.mk index e3c9fa6b47..d605dff393 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 \ |