From b5e8a26a13c190f7ec952508bf0a665103fe4ae9 Mon Sep 17 00:00:00 2001 From: steven Date: Sat, 3 Nov 2007 09:20:34 +0000 Subject: [PATCH] drop -L flags containing .libs directories from installed .la file --- infrastructure/build/libtool | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/infrastructure/build/libtool b/infrastructure/build/libtool index b7332e432ef..0d53289544f 100755 --- a/infrastructure/build/libtool +++ b/infrastructure/build/libtool @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $OpenBSD: libtool,v 1.9 2007/11/03 08:47:46 steven Exp $ +# $OpenBSD: libtool,v 1.10 2007/11/03 09:20:34 steven Exp $ # Copyright (c) 2007 Steven Mestdagh # @@ -968,7 +968,9 @@ sub process_deplibs my %la_in_ldpath; foreach my $lf (@linkflags) { - if ($lf =~ m/\/\S+\/(\S+\.la)/) { + if ($lf =~ m/-L\S+\Q$ltdir\E$/) { + $lf = ''; + } elsif ($lf =~ m/\/\S+\/(\S+\.la)/) { my $lafile = $1; my %lainfo; parse_file($lf, \%lainfo);