diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-12-17 20:21:31 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-12-17 21:13:05 -0600 |
| commit | 5ed43db9e8a574a0c66706deeb2feefb89958f96 (patch) | |
| tree | b571c51dfbb31626f2f02700bc103b0db03403bf | |
| parent | 6ab183533ef543ea96e15fcc5155321298c758a8 (diff) | |
Revert "gbuild: macosx.mk: remove salhelper hack"
This reverts commit 1d90f180cd263d7f99039bada57b3655d6f399df.
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index f1187cc343ce..6a2751ea4675 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 |