diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2012-07-10 15:53:27 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2012-07-10 15:53:27 +0000 |
| commit | 6e3f5d7fcfec3b55ee62ab38328885bbacaae56a (patch) | |
| tree | 23f949f0eddce3c78e3d1683bc90cc96fb2fee1c /usr.bin/libtool/LT | |
| parent | 6a795d24b2f278065ea4be3eb56af1ff2dbbdebf (diff) | |
move some shit around to (more or less) where it belongs
Diffstat (limited to 'usr.bin/libtool/LT')
| -rw-r--r-- | usr.bin/libtool/LT/LaFile.pm | 7 | ||||
| -rw-r--r-- | usr.bin/libtool/LT/Linker.pm | 4 | ||||
| -rw-r--r-- | usr.bin/libtool/LT/Program.pm | 9 |
3 files changed, 12 insertions, 8 deletions
diff --git a/usr.bin/libtool/LT/LaFile.pm b/usr.bin/libtool/LT/LaFile.pm index bf29445fd64..2255def2e8d 100644 --- a/usr.bin/libtool/LT/LaFile.pm +++ b/usr.bin/libtool/LT/LaFile.pm @@ -1,4 +1,4 @@ -# $OpenBSD: LaFile.pm,v 1.10 2012/07/10 13:32:10 espie Exp $ +# $OpenBSD: LaFile.pm,v 1.11 2012/07/10 15:53:26 espie Exp $ # Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org> # Copyright (c) 2012 Marc Espie <espie@openbsd.org> @@ -240,8 +240,9 @@ sub link my $orderedlibs = []; my $staticlibs = []; $parser->{args} = $args; - $args = $parser->parse_linkargs2(\@main::Rresolved, - \@main::libsearchdirs, $orderedlibs, $staticlibs, $dirs, $libs); + $args = $parser->parse_linkargs2(\@LT::Linker::Rresolved, + \@LT::Linker::libsearchdirs, $orderedlibs, $staticlibs, $dirs, + $libs); tsay {"staticlibs = \n", join("\n", @$staticlibs)}; tsay {"orderedlibs = @$orderedlibs"}; my $finalorderedlibs = reverse_zap_duplicates_ref($orderedlibs); diff --git a/usr.bin/libtool/LT/Linker.pm b/usr.bin/libtool/LT/Linker.pm index 0a995aa790d..43b1dc17d35 100644 --- a/usr.bin/libtool/LT/Linker.pm +++ b/usr.bin/libtool/LT/Linker.pm @@ -1,4 +1,4 @@ -# $OpenBSD: Linker.pm,v 1.1 2012/07/08 10:42:25 espie Exp $ +# $OpenBSD: Linker.pm,v 1.2 2012/07/10 15:53:26 espie Exp $ # Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org> # Copyright (c) 2012 Marc Espie <espie@openbsd.org> @@ -25,6 +25,8 @@ use LT::Util; use File::Basename; use Cwd qw(abs_path); +# XXX ? +our (@Rresolved, @libsearchdirs); sub create_symlinks { my ($self, $dir, $libs) = @_; diff --git a/usr.bin/libtool/LT/Program.pm b/usr.bin/libtool/LT/Program.pm index 4540f62d52f..baf91d79d06 100644 --- a/usr.bin/libtool/LT/Program.pm +++ b/usr.bin/libtool/LT/Program.pm @@ -1,4 +1,4 @@ -# $OpenBSD: Program.pm,v 1.8 2012/07/10 13:32:10 espie Exp $ +# $OpenBSD: Program.pm,v 1.9 2012/07/10 15:53:26 espie Exp $ # Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org> # Copyright (c) 2012 Marc Espie <espie@openbsd.org> @@ -117,8 +117,9 @@ sub link my $staticlibs = []; $parser->{args} = $args; $parser->{seen_la_shared} = 0; - $args = $parser->parse_linkargs2(\@main::Rresolved, - \@main::libsearchdirs, $orderedlibs, $staticlibs, $dirs, $libs); + $args = $parser->parse_linkargs2(\@LT::Linker::Rresolved, + \@LT::Linker::libsearchdirs, $orderedlibs, $staticlibs, $dirs, + $libs); tsay {"staticlibs = \n", join("\n", @$staticlibs)}; tsay {"orderedlibs = @$orderedlibs"}; my $finalorderedlibs = reverse_zap_duplicates_ref($orderedlibs); @@ -147,7 +148,7 @@ sub link # add libdirs to rpath if they are not in standard lib path for my $l (@$libdirs) { my $found = 0; - for my $d (@main::libsearchdirs) { + for my $d (@LT::Linker::libsearchdirs) { if ($l eq $d) { $found = 1; last; } } if (!$found) { push @$RPdirs, $l; } |