summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-05-17 10:37:57 +0000
committerjlam <jlam@pkgsrc.org>2004-05-17 10:37:57 +0000
commit9dc812c039aa3bb0969588d6c2b88dec46a9e517 (patch)
tree16e097079da56a6e2c2f2fb5a71207a969f0d331 /mk
parent8146ebe8b0e461df47f56237bb1adbf73d1817bb (diff)
downloadpkgsrc-9dc812c039aa3bb0969588d6c2b88dec46a9e517.tar.gz
libtool archives don't start with '-', so don't match those, which are
probably options to the compiler.
Diffstat (limited to 'mk')
-rw-r--r--mk/buildlink3/libtool-post-cache4
-rw-r--r--mk/buildlink3/libtool-post-logic4
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/buildlink3/libtool-post-cache b/mk/buildlink3/libtool-post-cache
index e62e84dedfc..3c4486461d0 100644
--- a/mk/buildlink3/libtool-post-cache
+++ b/mk/buildlink3/libtool-post-cache
@@ -1,4 +1,4 @@
-# $NetBSD: libtool-post-cache,v 1.4 2004/04/24 22:04:46 jlam Exp $
+# $NetBSD: libtool-post-cache,v 1.5 2004/05/17 10:37:57 jlam Exp $
#
# This file implements the default action of the "libtool" private
# cache.
@@ -16,7 +16,7 @@
# Skip the common cache lookup for all libtool archives that reference a
# locally-linked libtool archive.
#
-./*.la|../*.la|[!/]*.la|${WRKSRC}/*.la)
+./*.la|../*.la|[!-/]*.la|${WRKSRC}/*.la)
skipcache=yes
;;
esac
diff --git a/mk/buildlink3/libtool-post-logic b/mk/buildlink3/libtool-post-logic
index 21c33b5472e..b5592f4a935 100644
--- a/mk/buildlink3/libtool-post-logic
+++ b/mk/buildlink3/libtool-post-logic
@@ -1,4 +1,4 @@
-# $NetBSD: libtool-post-logic,v 1.7 2004/04/24 22:04:46 jlam Exp $
+# $NetBSD: libtool-post-logic,v 1.8 2004/05/17 10:37:57 jlam Exp $
case $arg in
#
@@ -70,7 +70,7 @@ case $arg in
# referenced directory. This makes linking against a symlinked local
# libtool archive possible.
#
-./*.la|../*.la|[!/]*.la|${WRKSRC}/*.la)
+./*.la|../*.la|[!-/]*.la|${WRKSRC}/*.la)
labase=`$basename $arg`
ladir=`$dirname $arg`
ldir=`cd $ladir; $pwd`