diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-23 17:53:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-23 17:55:39 +0200 |
| commit | a66f9903bba9dc7eeff6683ebddcd34d4ad70068 (patch) | |
| tree | 94571cf25c403a7395ddc03024d4d33665184aab /solenv/gbuild/platform/macosx.mk | |
| parent | ff6e6479328c94938e319c2e69a5f0ac35d20cfe (diff) | |
Undo basis/brand split: move dynamic libraries from basis to brand.
Diffstat (limited to 'solenv/gbuild/platform/macosx.mk')
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index aa560a3a0296..01ff9d0613a2 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -273,10 +273,11 @@ gb_LinkTarget__RPATHS := \ OOO:@__________________________________________________OOO/ \ BRAND: \ SDKBIN: \ - NONE: \ + NONE:@__VIA_LIBRARY_PATH__@ \ define gb_LinkTarget__get_installname -$(if $(2),-install_name '$(2)$(1)',) +$(if $(2),-install_name '$(2)$(1)',$(error + cannot determine -install_name for $(2))) endef gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) @@ -514,10 +515,6 @@ endef # ComponentTarget gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib -gb_Library_COMPONENTPREFIXES := \ - OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \ - URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \ - NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \ # UnoApiTarget |