summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2014-04-07 13:51:29 +0100
committerSimon Marlow <marlowsd@gmail.com>2014-04-07 15:41:53 +0100
commitec3e949e29990c054850f621e14a9d77e3197aee (patch)
treee8fdf4968b15795d36f8ef147a650b1f014f1d68
parentee481ffbd70e3ac3586bb7ab92f276e509a3579e (diff)
downloadhaskell-ec3e949e29990c054850f621e14a9d77e3197aee.tar.gz
Include LD_OPTS when building the RTS shared libs
-rw-r--r--rts/ghc.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/rts/ghc.mk b/rts/ghc.mk
index 3929adbee9..0d2b341a51 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -190,7 +190,9 @@ $$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/dist/libs.depend rts/d
"$$(RM)" $$(RM_OPTS) $$@
"$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
-no-auto-link-packages -Lrts/dist/build -l$$(LIBFFI_NAME) \
- `cat rts/dist/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@
+ `cat rts/dist/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) \
+ $$(rts_dist_$1_GHC_LD_OPTS) \
+ -o $$@
else
ifneq "$$(UseSystemLibFFI)" "YES"
LIBFFI_LIBS = -Lrts/dist/build -l$$(LIBFFI_NAME)
@@ -209,6 +211,7 @@ $$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/dist/libs.depend $$(
"$$(RM)" $$(RM_OPTS) $$@
"$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
-no-auto-link-packages $$(LIBFFI_LIBS) `cat rts/dist/libs.depend` $$(rts_$1_OBJS) \
+ $$(rts_dist_$1_GHC_LD_OPTS) \
$$(rts_$1_DTRACE_OBJS) -o $$@
endif
else