diff options
Diffstat (limited to 'solenv/bin/ooinstall')
| -rwxr-xr-x | solenv/bin/ooinstall | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index f2606f39e675..d634b617669a 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -20,7 +20,6 @@ use Cwd; $path = ''; $strip = ''; -$do_link = 0; $is_windows = 0; my $tmp_dir; @@ -45,9 +44,7 @@ if ($ENV{'SYSTEM_MOZILLA'} eq 'YES') { $ENV{'PYTHONPATH'} = "$ENV{'SRC_ROOT'}/instsetoo_native/$ENV{'INPATH'}/bin:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python:$ENV{'SOLARVERSION'}/$ENV{'INPATH'}/lib/python/lib-dynload"; for $arg (@ARGV) { - if ($arg eq '-l' || $arg eq '--link') { - $do_link = 1; - } elsif ($arg eq '-s' || $arg eq '--strip') { + if ($arg eq '-s' || $arg eq '--strip') { $strip = "-strip"; } elsif ($arg eq '-h' || $arg eq '--help') { $help = 1; @@ -61,8 +58,7 @@ for $arg (@ARGV) { $help = 1 if $path eq ''; if ($help) { - print "ooinstall [-l] [-s] <prefix to install to>\n"; - print " -l/--link - performs a linkoo on the installed source\n"; + print "ooinstall [-s] <prefix to install to>\n"; print " -s/--strip - strip the installed binaries\n"; exit 1; } @@ -121,11 +117,6 @@ if ($ENV{BUILD_TYPE} =~ m/ODK/) { } print "Installer finished\n"; -if ($do_link && !$is_windows) { - system("$ENV{SOLARENV}/bin/linkoo $path $ENV{BUILDDIR}") && - die "linkoo failed: $!"; -} - # Local Variables: # cperl-indent-level: 4 # indent-tabs-mode: nil |