[commit: ghc] ghc-7.8: Include LD_OPTS when building the RTS shared libs (cbb5460)

git at git.haskell.org git at git.haskell.org
Mon Apr 14 13:53:33 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.8
Link       : http://ghc.haskell.org/trac/ghc/changeset/cbb54604bb15ead8df7e663111dd32c361c5c551/ghc

>---------------------------------------------------------------

commit cbb54604bb15ead8df7e663111dd32c361c5c551
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Mon Apr 7 13:51:29 2014 +0100

    Include LD_OPTS when building the RTS shared libs
    
    (cherry picked from commit ec3e949e29990c054850f621e14a9d77e3197aee)


>---------------------------------------------------------------

cbb54604bb15ead8df7e663111dd32c361c5c551
 rts/ghc.mk |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rts/ghc.mk b/rts/ghc.mk
index 3929adb..0d2b341 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



More information about the ghc-commits mailing list