As a refinement on the previous commit, we shouldn't even add .../.libs

directories to the search list for libtool archives.  Also make it clear
that the warning comes from the libtool wrapper.
This commit is contained in:
jlam 2002-12-28 18:58:09 +00:00
parent ebe087d42d
commit a36d340678

View file

@ -1,15 +1,22 @@
# $NetBSD: libtool-logic,v 1.2 2002/12/28 18:49:57 jlam Exp $
# $NetBSD: libtool-logic,v 1.3 2002/12/28 18:58:09 jlam Exp $
case $arg in
-L.|-L./*|-L..*|-L${WRKSRC}*)
case $fixlibpath in
yes)
lpath=`$echo "X$arg" | $Xsed -e "s/^-L//"`
$echo "*** [buildlink2] Warning: deprecated -L$lpath detected"
case "$rellpath" in
*"$lpath "*) ;;
*"$lpath"*) ;;
*) rellpath="$rellpath $lpath" ;;
case $arg in
*/.libs)
# ignore -L.../.libs
;;
*)
$echo "*** [buildlink2] Warning: libtool detected $arg"
lpath=`$echo "X$arg" | $Xsed -e "s/^-L//"`
case "$rellpath" in
*"$lpath "*) ;;
*"$lpath"*) ;;
*) rellpath="$rellpath $lpath" ;;
esac
;;
esac
;;
esac
@ -21,7 +28,7 @@ case $arg in
for dir in $rellpath; do
la="$dir/lib$lib.la"
if $test -f "$la"; then
$echo "*** [buildlink2] Warning: replaced $arg with $la"
$echo "*** [buildlink2] Warning: libtool replaced $arg with $la"
arg="$la"
cachesettings='skipcache=yes'
break