diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-02-01 15:09:52 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-02-01 15:22:24 +0100 |
| commit | 6f8caab7d57321650455163a6cce164a30f6a9cf (patch) | |
| tree | 6a7cc201ae77484e79049a20abb34bbb85c10410 | |
| parent | c2d14df725768ec9c3b6b65a4e02baa0faf41676 (diff) | |
No need for aliases here
Change-Id: I29dcc26eb13222ef4348ab3281a19b2e6f8c46f2
| -rw-r--r-- | solenv/bin/macosx-change-install-names.pl | 8 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index ed60cc2030e9..56cf2dc18e8e 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -74,14 +74,6 @@ sub action($$$) @ARGV >= 2 or die 'Usage: app|shl UREBIN|URELIB|OOO|SDKBIN|OXT|NONE <filepath>*'; $type = shift @ARGV; $loc = shift @ARGV; -if ($type eq "Executable") -{ - $type = "app" -} -elsif ($type eq "Library" || $type eq "SharedLibrary") -{ - $type = "shl" -} foreach $file (@ARGV) { my $call = "otool -L $file"; diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 0de72bb8fa93..8ac274a78307 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -169,10 +169,10 @@ $(call gb_Helper_abbreviate_dirs,\ -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) && \ $(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1),:) && \ $(if $(filter Executable,$(TARGETTYPE)), \ - $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable \ + $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl app \ $(LAYER) $(1) &&) \ $(if $(filter Library Bundle CppunitTest,$(TARGETTYPE)),\ - $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) && \ + $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl shl $(LAYER) $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) && \ ln -sf $(notdir $(1)) $(basename $(1)).jnilib &&) \ rm -f $${DYLIB_FILE}) endef |