Kaydet (Commit) 6f8caab7 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

No need for aliases here

Change-Id: I29dcc26eb13222ef4348ab3281a19b2e6f8c46f2
üst c2d14df7
...@@ -74,14 +74,6 @@ sub action($$$) ...@@ -74,14 +74,6 @@ sub action($$$)
@ARGV >= 2 or die 'Usage: app|shl UREBIN|URELIB|OOO|SDKBIN|OXT|NONE <filepath>*'; @ARGV >= 2 or die 'Usage: app|shl UREBIN|URELIB|OOO|SDKBIN|OXT|NONE <filepath>*';
$type = shift @ARGV; $type = shift @ARGV;
$loc = shift @ARGV; $loc = shift @ARGV;
if ($type eq "Executable")
{
$type = "app"
}
elsif ($type eq "Library" || $type eq "SharedLibrary")
{
$type = "shl"
}
foreach $file (@ARGV) foreach $file (@ARGV)
{ {
my $call = "otool -L $file"; my $call = "otool -L $file";
......
...@@ -169,10 +169,10 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -169,10 +169,10 @@ $(call gb_Helper_abbreviate_dirs,\
-o $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) && \ -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) && \
$(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1),:) && \ $(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1),:) && \
$(if $(filter Executable,$(TARGETTYPE)), \ $(if $(filter Executable,$(TARGETTYPE)), \
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable \ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl app \
$(LAYER) $(1) &&) \ $(LAYER) $(1) &&) \
$(if $(filter Library Bundle CppunitTest,$(TARGETTYPE)),\ $(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 &&) \ ln -sf $(notdir $(1)) $(basename $(1)).jnilib &&) \
rm -f $${DYLIB_FILE}) rm -f $${DYLIB_FILE})
endef endef
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment