diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2012-07-13 13:25:13 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2012-07-13 13:25:13 +0000 |
| commit | a334aea3f6a6bfe3cb380b5b7ea6efcbebef70a3 (patch) | |
| tree | c52f706cb1774d963e7c04e1a1c092cce6561d5c /usr.bin/libtool | |
| parent | 4a62390af8ed5a2c7814104b238141a869e5d451 (diff) | |
minor cleanup
Diffstat (limited to 'usr.bin/libtool')
| -rw-r--r-- | usr.bin/libtool/LT/LaFile.pm | 4 | ||||
| -rw-r--r-- | usr.bin/libtool/LT/Mode/Link.pm | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/usr.bin/libtool/LT/LaFile.pm b/usr.bin/libtool/LT/LaFile.pm index 54c5e757492..94bbb72e3c1 100644 --- a/usr.bin/libtool/LT/LaFile.pm +++ b/usr.bin/libtool/LT/LaFile.pm @@ -1,4 +1,4 @@ -# $OpenBSD: LaFile.pm,v 1.17 2012/07/13 11:56:12 espie Exp $ +# $OpenBSD: LaFile.pm,v 1.18 2012/07/13 13:25:12 espie Exp $ # Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org> # Copyright (c) 2012 Marc Espie <espie@openbsd.org> @@ -190,7 +190,7 @@ sub install LT::Exec->install(@$instprog, @realinstopts, $s, $d); } # for libraries with a -release in their name - my @libnames = split /\s+/, $lainfo->{'library_names'}; + my @libnames = split /\s+/, $lainfo->{library_names}; foreach my $n (@libnames) { next if $n eq $sharedlib; unlink("$dstdir/$n"); diff --git a/usr.bin/libtool/LT/Mode/Link.pm b/usr.bin/libtool/LT/Mode/Link.pm index ba9cb6c2ac9..ed193f41d22 100644 --- a/usr.bin/libtool/LT/Mode/Link.pm +++ b/usr.bin/libtool/LT/Mode/Link.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Link.pm,v 1.18 2012/07/13 11:56:12 espie Exp $ +# $OpenBSD: Link.pm,v 1.19 2012/07/13 13:25:12 espie Exp $ # # Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org> # Copyright (c) 2012 Marc Espie <espie@openbsd.org> @@ -604,9 +604,9 @@ sub internal_parse_linkargs1 my $fulla = abs_path($_); require LT::LaFile; my $lainfo = LT::LaFile->parse($fulla); - my $dlname = $lainfo->{'dlname'}; - my $oldlib = $lainfo->{'old_library'}; - my $libdir = $lainfo->{'libdir'}; + my $dlname = $lainfo->{dlname}; + my $oldlib = $lainfo->{old_library}; + my $libdir = $lainfo->{libdir}; if ($dlname ne '') { if (!exists $libs->{$key}) { $libs->create($key)->{lafile} = $fulla; @@ -654,8 +654,7 @@ sub parse_linkargs2 my ($self, $gp, $orderedlibs, $staticlibs, $dirs, $libs) = @_; tsay {"parse_linkargs2"}; tsay {" args: @{$self->{args}}"}; - $self->{result} = []; - my $result = $self->{result}; + my $result = []; foreach my $_ (@{$self->{args}}) { tsay {" processing $_"}; @@ -717,7 +716,7 @@ sub parse_linkargs2 } } tsay {"end parse_linkargs2"}; - return $self->{result}; + return $result; } sub new |