solenv/gbuild/platform/macosx.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 5ed43db9e8a574a0c66706deeb2feefb89958f96 Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Sat Dec 17 20:21:31 2011 -0600 Revert "gbuild: macosx.mk: remove salhelper hack" This reverts commit 1d90f180cd263d7f99039bada57b3655d6f399df. diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index f1187cc..6a2751e 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -149,8 +149,10 @@ 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)',$(error +$(if $(2),-install_name '$(2)$(1)$(if $(filter $(1),libuno_salhelpergcc3.dylib),.3)',$(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