cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

error out if we cannot find a library file in the library hash

Browse Source 
restrict addition of a flag to library link mode
This commit is contained in:
steven 2008-10-29 15:28:22 +00:00
parent f4bbfe8fae
commit 0d31269c32
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
infrastructure/build/libtool
View File

@ -1,5 +1,5 @@
#!/usr/bin/perl
# $OpenBSD: libtool,v 1.36 2008/10/29 12:13:01 steven Exp $
# $OpenBSD: libtool,v 1.37 2008/10/29 15:28:22 steven Exp $
# Copyright (c) 2007-2008 Steven Mestdagh <steven@openbsd.org>
#
@ -1118,7 +1118,7 @@ sub linkcmds
my $prev_was_archive = 0;
my $libcounter = 0;
foreach my $k (@finalorderedlibs) {
my $a = $libs{$k};
my $a = $libs{$k} || die "ERROR: $k not found in \$libs";
if ($a =~ m/\.a$/) {
# don't make a -lfoo out of a static library
if ($lmode == LIBRARY) {
@ -1134,8 +1134,10 @@ sub linkcmds
}
$prev_was_archive = 1;
} else {
if ($prev_was_archive) {
push @libflags, '-Wl,-no-whole-archive';
if ($lmode == LIBRARY) {
if ($prev_was_archive) {
push @libflags, '-Wl,-no-whole-archive';
}
}
$prev_was_archive = 0;
my $lib = basename $a;