===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/libtool/libtool,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/libtool/libtool	2012/07/07 21:45:15	1.21
--- src/usr.bin/libtool/libtool	2012/07/08 09:36:31	1.22
***************
*** 1,5 ****
  #!/usr/bin/perl
! # $OpenBSD: libtool,v 1.21 2012/07/07 21:45:15 jasper Exp $
  
  # Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org>
  # Copyright (c) 2012 Marc Espie <espie@openbsd.org>
--- 1,5 ----
  #!/usr/bin/perl
! # $OpenBSD: libtool,v 1.22 2012/07/08 09:36:31 jasper Exp $
  
  # Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org>
  # Copyright (c) 2012 Marc Espie <espie@openbsd.org>
***************
*** 51,56 ****
--- 51,63 ----
  	ltdir => $ltdir,
      };
      ($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;
  }
  
***************
*** 227,236 ****
  	);
  
  my $ltconfig = LT::OSConfig->new;
- my @no_shared_archs = qw(m88k vax);
  my $cwd = getcwd();
- my $instlibdir = $ENV{LIBDIR} // '/usr/local/lib';
- 
  my $mode;
  my $verbose = 1;
  
--- 234,240 ----
***************
*** 242,254 ****
  # 	* both -R libdir and -rpath libdir add libdir to the run-time path
  # -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])) {
  	shift @ARGV;
  }
--- 246,251 ----
***************
*** 264,270 ****
  			    my $v = `uname -r`;
  			    chomp $v;
  			    say "host: $ltconfig->{gnu_arch}-unknown-openbsd$v";
! 			    say "enable shared libraries" unless $noshared;
  			    say "enable static libraries";
  			    exit 0;
  			},
--- 261,267 ----
  			    my $v = `uname -r`;
  			    chomp $v;
  			    say "host: $ltconfig->{gnu_arch}-unknown-openbsd$v";
! 			    say "enable shared libraries" unless $ltconfig->{noshared};
  			    say "enable static libraries";
  			    exit 0;
  			},
***************
*** 327,333 ****
  # from here, options may be intermixed with arguments
  $gp->configure('permute');
  
! $mode->run($ltprog, $gp, $noshared);
  
  if (LT::Exec->performed == 0) {
  	die "No commands to execute.\n"
--- 324,330 ----
  # from here, options may be intermixed with arguments
  $gp->configure('permute');
  
! $mode->run($ltprog, $gp, $ltconfig->{noshared});
  
  if (LT::Exec->performed == 0) {
  	die "No commands to execute.\n"