From: Duncan Coutts <duncan@well-typed.com>
Date: Tue, 19 May 2009 12:08:01 +0000 (+0000)
Subject: Use shared lib mode -dynload deploy to build the rts and core shared libs
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=988bfabb5e8a3a743d03e57f2f25ca1008c6e6f1

Use shared lib mode -dynload deploy to build the rts and core shared libs
This is now the same as the old default. Currently we cannot embed
rpaths because they would point to the build tree. We should embed
rpaths relative to the $ORIGIN in future.
---

diff --git a/rts/ghc.mk b/rts/ghc.mk
index d0719ee..fba236b 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -155,7 +155,8 @@ rts_$1_OBJS = $$(rts_$1_C_OBJS) $$(rts_$1_S_OBJS) $$(rts_$1_CMM_OBJS)
 ifneq "$$(findstring dyn, $1)" ""
 $$(rts_$1_LIB) : $$(rts_$1_OBJS) rts/libs.depend
 	$$(RM) $$@
-	$$(rts_dist_HC) -shared -dynamic -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) -o $$@
+	$$(rts_dist_HC) -shared -dynamic -dynload deploy \
+	  -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) -o $$@
 else
 $$(rts_$1_LIB) : $$(rts_$1_OBJS)
 	$$(RM) $$@
diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk
index 636f641..0485a20 100644
--- a/rules/build-package-way.mk
+++ b/rules/build-package-way.mk
@@ -44,7 +44,7 @@ $$($1_$2_$3_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_dyn_C_OBJS) $$($1_$2_dyn_S_OBJS
 	$$(RM) $$@
 	$$($1_$2_HC) $$($1_$2_dyn_C_OBJS) $$($1_$2_dyn_S_OBJS) $$($1_$2_$3_HS_OBJS) \
          `$$($1_$2_$3_MKSTUBOBJS)` \
-         -shared -dynamic \
+         -shared -dynamic -dynload deploy \
          -no-auto-link-packages $$(addprefix -package,$$($1_$2_DEPS)) \
          -o $$@
 else