From: pho@cielonegro.org <unknown>
Date: Sat, 8 May 2010 15:11:55 +0000 (+0000)
Subject: Correct install-name for dynamic Darwin rts
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=ffe09dea3e59cb9ad35cf74a99a1ad7d61cd3626;p=ghc-hetmet.git

Correct install-name for dynamic Darwin rts
---

diff --git a/rts/ghc.mk b/rts/ghc.mk
index bf110fa..5c0224f 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -167,15 +167,15 @@ $$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend
 	"$$(RM)" $$(RM_OPTS) $$@
 	"$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
 	  -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@
-ifeq "$$(darwin_TARGET_OS)" "1"
-	# Ensure library's install name is correct before anyone links with it.
-	install_name_tool -id $(ghclibdir)/$$(rts_$1_LIB_NAME) $$@
-endif
 else
 $$(rts_$1_LIB) : $$(rts_$1_OBJS) rts/libs.depend
 	"$$(RM)" $$(RM_OPTS) $$@
 	"$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
 	  -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) -o $$@
+ifeq "$$(darwin_TARGET_OS)" "1"
+	# Ensure library's install name is correct before anyone links with it.
+	install_name_tool -id $(ghclibdir)/$$(rts_$1_LIB_NAME) $$@
+endif
 endif
 else
 $$(rts_$1_LIB) : $$(rts_$1_OBJS)