- move some more stuff into OSConfig

- zap references to variables that don't exist anymore

ok espie@

3 files changed, 10 insertions, 8 deletions

diff --git a/usr.bin/libtool/LT/LaFile.pm b/usr.bin/libtool/LT/LaFile.pm
index fb4dd8f1e9c..f82d860c277 100644
--- a/usr.bin/libtool/LT/LaFile.pm
+++ b/usr.bin/libtool/LT/LaFile.pm
@@ -1,4 +1,4 @@
-# $OpenBSD: LaFile.pm,v 1.7 2012/07/08 10:42:25 espie Exp $
+# $OpenBSD: LaFile.pm,v 1.8 2012/07/08 12:29:21 jasper Exp $
 
 # Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org>
 # Copyright (c) 2012 Marc Espie <espie@openbsd.org>
@@ -62,7 +62,7 @@ sub write
 	my $libdir = $lainfo->stringize('libdir');
 
 	open(my $la, '>', $filename) or die "Cannot write $filename: $!\n";
-	say "creating $filename" if $main::verbose || $main::D;
+	say "creating $filename" if $main::verbose;
 	print $la <<EOF
 # $name - libtool library file
 # Generated by libtool $version
diff --git a/usr.bin/libtool/LT/LoFile.pm b/usr.bin/libtool/LT/LoFile.pm
index b91289c66bc..f8f73e2bb0c 100644
--- a/usr.bin/libtool/LT/LoFile.pm
+++ b/usr.bin/libtool/LT/LoFile.pm
@@ -1,4 +1,4 @@
-# $OpenBSD: LoFile.pm,v 1.2 2012/07/06 11:30:41 espie Exp $
+# $OpenBSD: LoFile.pm,v 1.3 2012/07/08 12:29:21 jasper Exp $
 
 # Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org>
 # Copyright (c) 2012 Marc Espie <espie@openbsd.org>
@@ -34,10 +34,10 @@ sub write
 	my $name = basename $filename;
 
 	open(my $lo, '>', $filename) or die "Cannot write $filename: $!\n";
-	say "creating $filename" if $main::verbose || $main::D;
+	say "creating $filename" if $main::verbose;
 	print $lo <<EOF
 # $name - a libtool object file
-# Generated by libtool $main::version
+# Generated by libtool $version
 #
 pic_object='$picobj'
 non_pic_object='$nonpicobj'
diff --git a/usr.bin/libtool/libtool b/usr.bin/libtool/libtool
index aa0a76e3f6f..c6f2eb40a42 100755
--- a/usr.bin/libtool/libtool
+++ b/usr.bin/libtool/libtool
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $OpenBSD: libtool,v 1.23 2012/07/08 10:42:25 espie Exp $
+# $OpenBSD: libtool,v 1.24 2012/07/08 12:29:21 jasper Exp $
 
 # Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org>
 # Copyright (c) 2012 Marc Espie <espie@openbsd.org>
@@ -49,6 +49,8 @@ sub new
     my $self = {
 	machine_arch => $Config{ARCH},
 	ltdir => $ltdir,
+	version => $version,
+	pic_flags => join(' ', @picflags),
     };
     ($self->{gnu_arch} = $self->{machine_arch}) =~ s/amd64/x86_64/;
 
@@ -272,8 +274,8 @@ $gp->handle_options('-config' => \&config,
 		'-verbose|-no-silent|-no-quiet|v' => sub {$verbose = 1;},
 		'-tag=' => sub { $gp->add_tag($_[2]); },
 		'-version' => sub { 
-				say "libtool (not (GNU libtool)) $version" ; 
-				exit 0; 
+				say "libtool (not (GNU libtool)) $ltconfig->{version}";
+				exit 0;
 			    },
 	);