diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-26 10:21:23 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-26 10:21:23 +0100 |
| commit | 47e395cad525385d4a8afdd359bcee2b6380fa22 (patch) | |
| tree | 08b181b8d87bccba6dfb034f7606072fb333da40 /solenv/gbuild/Library.mk | |
| parent | 9303192c4f1ff623f20ef4501723c003678140de (diff) | |
On Mac, the lib/libuno_*.dylib symlinks are not in the SDK
...but rather dynamically created (via the SDK's setsdkenv_unix.sh.in) in the
SDK's per-user output tree. So better reflect that in instdir by putting the
symlinks into workdir/LinkTarget/Library/ instead on Mac. (Which has the
additional benefit that the location of the symlinks doesn't change with the
versioned SDKDIRNAME.)
Change-Id: I77237f6a5d64771c3cb0866e125925ed7b0ecdaf
Diffstat (limited to 'solenv/gbuild/Library.mk')
| -rw-r--r-- | solenv/gbuild/Library.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 6bc20f7c5ca5..17135e5dcfd9 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -45,7 +45,7 @@ $(WORKDIR)/Clean/Library/% : gb_Library__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_LAYER_DIRS))) gb_Library_get_instdir = $(call gb_Library__get_dir_for_layer,$(call gb_Library_get_layer,$(1))) -gb_Library_get_ilib_target = $(if $(filter $(1),$(gb_Library_RTVERLIBS) $(gb_Library_UNOVERLIBS)),$(INSTDIR)/$(SDKDIRNAME)/lib/$(call gb_Library_get_ilibfilename,$(1)),$(gb_Library_DLLDIR)/$(call gb_Library_get_ilibfilename,$(1))) +gb_Library_get_ilib_target = $(if $(filter $(1),$(gb_Library_RTVERLIBS) $(gb_Library_UNOVERLIBS)),$(call gb_Library_get_sdk_link_dir)/$(call gb_Library_get_ilibfilename,$(1)),$(gb_Library_DLLDIR)/$(call gb_Library_get_ilibfilename,$(1))) define gb_Library_Library $(call gb_Postprocess_register_target,AllLibraries,Library,$(1)) |