diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-20 07:22:26 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-20 07:22:26 +0200 |
| commit | a3cd73f3153b4a6c337144bd0f85769f059b3019 (patch) | |
| tree | dd36153c3d62e08d2806400dfb7caa96b1ce3893 /solenv | |
| parent | ff1c626fa1380c7af5a135f80b45de7e62025eed (diff) | |
Reverted previous ff1c626, instead renamed NONEBIN -> NONE.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index cabf855f3eb3..aa560a3a0296 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -273,7 +273,7 @@ gb_LinkTarget__RPATHS := \ OOO:@__________________________________________________OOO/ \ BRAND: \ SDKBIN: \ - NONEBIN: \ + NONE: \ define gb_LinkTarget__get_installname $(if $(2),-install_name '$(2)$(1)',) @@ -338,9 +338,8 @@ $(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)) &&) \ @@ -452,7 +451,7 @@ gb_Executable_LAYER := \ $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \ $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \ $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \ - $(foreach exe,$(gb_Executable_NONE),$(exe):NONEBIN) \ + $(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \ gb_Executable_get_rpath := |