[commit: ghc] master: Don't set dynlib install names when building (b3dacbd)
Ian Lynagh <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/b3dacbdb7fa6881d604f4b57fa2fadf19a048304 >--------------------------------------------------------------- commit b3dacbdb7fa6881d604f4b57fa2fadf19a048304 Author: Ian Lynagh <[email protected]> Date: Sun Oct 14 01:35:54 2012 +0100 Don't set dynlib install names when building When building things to run in the build tree, we want the install name to be the location in the build tree. Bindists may be installed somewhere other than the configured install location, so we weren't even necessarily setting it to the right value. >--------------------------------------------------------------- rts/ghc.mk | 4 ---- rules/build-package-way.mk | 1 - 2 files changed, 0 insertions(+), 5 deletions(-) diff --git a/rts/ghc.mk b/rts/ghc.mk index b01f199..2147c1f 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -187,10 +187,6 @@ $$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend rts/dist "$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \ -no-auto-link-packages -Lrts/dist/build -lffi `cat rts/libs.depend` $$(rts_$1_OBJS) \ $$(rts_$1_DTRACE_OBJS) -o $$@ -ifeq "$$(darwin_HOST_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) $$(rts_$1_DTRACE_OBJS) $$(rts_ffi_objs_stamp) diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index 9420aa4..c367863 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -81,7 +81,6 @@ $$($1_$2_$3_LIB) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS) $$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) $$($1_$2_$3_ALL_OBJS) \ -shared -dynamic -dynload deploy \ $$(addprefix -l,$$($1_$2_EXTRA_LIBRARIES)) $$(addprefix -L,$$($1_$2_EXTRA_LIBDIRS)) \ - -dylib-install-name $(ghclibdir)/`basename "$$@" | sed 's/^libHS//;s/[-]ghc.*//'`/`basename "$$@"` \ -no-auto-link-packages \ -o $$@ endif