[Libreoffice-commits] .: Branch 'feature/gbuild_extensions' - solenv/gbuild

[Michael Stahl]

 solenv/gbuild/platform/macosx.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7e5b321535977ccddc6703c0ad4e5d25af797654
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 6 19:44:33 2012 +0100

    gbuild: macosx.mk: Bundles have no install_name

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 7b2517b..e693ecf 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -309,10 +309,12 @@ endef
 gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script)
 
 # bundle is a special kind of library that exists only on Darwin/OSX
-# set the TARGETTYPE to Bundle
+# set the TARGETTYPE to Bundle, and clear install_name(RPATH)
 define gb_Library_Bundle
 $(call gb_Library_Library,$(1))
 $(call gb_LinkTarget_set_targettype,$(call gb_Library_get_linktargetname,$(1)),Bundle)
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : \
+	RPATH :=
 endef
 
 # StaticLibrary class