diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-09-20 00:01:41 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-09-20 00:02:18 -0500 |
| commit | ff1c626fa1380c7af5a135f80b45de7e62025eed (patch) | |
| tree | 9f4572d9803df17f7a4d1b147c85bb66b23eefbe /solenv | |
| parent | soffice.sh should not be delivered on MacOS (diff) | |
| download | core-ff1c626fa1380c7af5a135f80b45de7e62025eed.tar.gz core-ff1c626fa1380c7af5a135f80b45de7e62025eed.zip | |
do not call macosx-change-install-name for NONEBIN executable
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index e30201bc685f..cabf855f3eb3 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -338,8 +338,9 @@ $(call gb_Helper_abbreviate_dirs,\ -o $(1) \ `cat $${DYLIB_FILE}` && \ $(if $(filter Executable,$(TARGETTYPE)), \ + $(if $(filter-out NONEBIN,$(LAYER)), \ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable \ - $(LAYER) $(1) &&) \ + $(LAYER) $(1) &&)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),\ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \ ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \ |