[BACK]Return to libtool CVS log [TXT][DIR] Up to [local] / src / usr.bin / libtool

Diff for /src/usr.bin/libtool/libtool between version 1.21 and 1.22

version 1.21, 2012/07/07 21:45:15 version 1.22, 2012/07/08 09:36:31
Line 51 
Line 51 
         ltdir => $ltdir,          ltdir => $ltdir,
     };      };
     ($self->{gnu_arch} = $self->{machine_arch}) =~ s/amd64/x86_64/;      ($self->{gnu_arch} = $self->{machine_arch}) =~ s/amd64/x86_64/;
   
       if (grep { $_ eq $self->{machine_arch} } qw(m88k vax)) {
           $self->{noshared} = 1;
       } else {
           $self->{noshared} = 0;
       }
   
     bless $self, $class;      bless $self, $class;
 }  }
   
Line 227 
Line 234 
         );          );
   
 my $ltconfig = LT::OSConfig->new;  my $ltconfig = LT::OSConfig->new;
 my @no_shared_archs = qw(m88k vax);  
 my $cwd = getcwd();  my $cwd = getcwd();
 my $instlibdir = $ENV{LIBDIR} // '/usr/local/lib';  
   
 my $mode;  my $mode;
 my $verbose = 1;  my $verbose = 1;
   
Line 242 
Line 246 
 #       * both -R libdir and -rpath libdir add libdir to the run-time path  #       * both -R libdir and -rpath libdir add libdir to the run-time path
 # -Wl,-rpath,libdir will bypass libtool.  # -Wl,-rpath,libdir will bypass libtool.
   
 # build static/shared objects?  
 my $noshared = 0;  
 if (grep { $_ eq $ltconfig->{machine_arch} } @no_shared_archs) {  
         $noshared = 1;  
 }  
   
   
 if ($mode = LT::Options->is_abreviated_mode($ARGV[0])) {  if ($mode = LT::Options->is_abreviated_mode($ARGV[0])) {
         shift @ARGV;          shift @ARGV;
 }  }
Line 264 
Line 261 
                             my $v = `uname -r`;                              my $v = `uname -r`;
                             chomp $v;                              chomp $v;
                             say "host: $ltconfig->{gnu_arch}-unknown-openbsd$v";                              say "host: $ltconfig->{gnu_arch}-unknown-openbsd$v";
                             say "enable shared libraries" unless $noshared;                              say "enable shared libraries" unless $ltconfig->{noshared};
                             say "enable static libraries";                              say "enable static libraries";
                             exit 0;                              exit 0;
                         },                          },
Line 327 
Line 324 
 # from here, options may be intermixed with arguments  # from here, options may be intermixed with arguments
 $gp->configure('permute');  $gp->configure('permute');
   
 $mode->run($ltprog, $gp, $noshared);  $mode->run($ltprog, $gp, $ltconfig->{noshared});
   
 if (LT::Exec->performed == 0) {  if (LT::Exec->performed == 0) {
         die "No commands to execute.\n"          die "No commands to execute.\n"
Legend:
Removed from v.1.21  
changed lines
  Added in v.1.22