=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/libtool/libtool,v retrieving revision 1.6 retrieving revision 1.7 diff -c -r1.6 -r1.7 *** src/usr.bin/libtool/libtool 2012/06/27 10:33:51 1.6 --- src/usr.bin/libtool/libtool 2012/06/28 18:24:42 1.7 *************** *** 1,5 **** #!/usr/bin/perl ! # $OpenBSD: libtool,v 1.6 2012/06/27 10:33:51 jasper Exp $ # Copyright (c) 2007-2010 Steven Mestdagh # --- 1,5 ---- #!/usr/bin/perl ! # $OpenBSD: libtool,v 1.7 2012/06/28 18:24:42 espie Exp $ # Copyright (c) 2007-2010 Steven Mestdagh # *************** *** 204,219 **** sub create_symlinks { ! my $dir = shift; ! my $libs = shift; ! if (! -d $dir) { ! mkdir $dir or die "Cannot create directory: $!\n"; } foreach my $l (values %$libs) { my $f = $l->{fullpath}; ! next if (!defined $f); ! next if ($f =~ m/\.a$/); my $libnames = []; if (defined $l->{lafile}) { require LT::LaFile; --- 204,218 ---- sub create_symlinks { ! my ($dir, $libs) = @_; if (! -d $dir) { ! mkdir($dir) or die "Cannot mkdir($dir) : $!\n"; } + foreach my $l (values %$libs) { my $f = $l->{fullpath}; ! next if !defined $f; ! next if $f =~ m/\.a$/; my $libnames = []; if (defined $l->{lafile}) { require LT::LaFile; *************** *** 227,240 **** foreach my $libfile (@$libnames) { my $link = "$dir/$libfile"; LT::Trace::debug {"ln -s $f $link\n"}; ! if (! -f $link) { ! my $p = abs_path($f); ! if (!symlink($p, $link)) { ! die "Cannot create symlink($p, $link): $!\n" unless $!{EEXIST}; ! } ! } } } } # try to guess libtool mode when it is not specified --- 226,239 ---- foreach my $libfile (@$libnames) { my $link = "$dir/$libfile"; LT::Trace::debug {"ln -s $f $link\n"}; ! next if -f $link; ! my $p = abs_path($f); ! symlink($p, $link) or ! die "Cannot create symlink($p, $link): $!\n" ! unless $!{EEXIST}; } } + return $dir; } # try to guess libtool mode when it is not specified