solenv/gbuild/platform/macosx.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
New commits: commit 883b12a76d038755992999fa74f69560a8eee1d1 Author: Michael Stahl <mst...@redhat.com> Date: Thu Dec 15 22:57:51 2011 +0100 gbuild: macosx.mk: tinderbox fails on version script diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 2ffe0f0..2b0d167 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -195,7 +195,6 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ - $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)-exported_symbols_list$(COMMA)$(SOVERSIONSCRIPT)) \ $(subst \d,$$,$(RPATH)) \ $(T_LDFLAGS) \ $(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \ commit 1d90f180cd263d7f99039bada57b3655d6f399df Author: Michael Stahl <mst...@redhat.com> Date: Thu Dec 15 22:41:46 2011 +0100 gbuild: macosx.mk: remove salhelper hack diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index ea576f3..2ffe0f0 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -149,10 +149,8 @@ gb_LinkTarget__RPATHS := \ SDKBIN: \ NONE:@__VIA_LIBRARY_PATH__@ \ -# The below contains a bad hack to set the correct install name for -# libuno_salhepergcc3.dylib.3, with a trailing ".3": define gb_LinkTarget__get_installname -$(if $(2),-install_name '$(2)$(1)$(if $(filter $(1),libuno_salhelpergcc3.dylib),.3)',$(error +$(if $(2),-install_name '$(2)$(1)',$(error cannot determine -install_name for $(2))) endef _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits