summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorsbd <sbd>2012-05-24 07:27:27 +0000
committersbd <sbd>2012-05-24 07:27:27 +0000
commit3bb4a3cdb4a13ade37916c32a004b81eec015364 (patch)
tree49b7f6a0081bb8696c7add7a7e44ca69a73024bf /mk
parent9859f152f552b9d6b63d4427a50d7320b0dcf0c1 (diff)
downloadpkgsrc-3bb4a3cdb4a13ade37916c32a004b81eec015364.tar.gz
Treat /usr/lib${LIBABISUFFIX}} the same as /usr/lib and strip it out of
the runtime library search path.
Diffstat (limited to 'mk')
-rw-r--r--mk/buildlink3/bsd.buildlink3.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index bd2382bb2b4..48bdbcdfb07 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.213 2012/05/11 11:09:42 joerg Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.214 2012/05/24 07:27:27 sbd Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -828,10 +828,10 @@ _BLNK_PASSTHRU_RPATHDIRS+= ${X11BASE}/lib
#
_BLNK_PASSTHRU_RPATHDIRS+= ${BUILDLINK_PASSTHRU_RPATHDIRS}
#
-# Strip out /usr/lib as it's always automatically in the runtime library
-# search path.
+# Strip out /usr/lib (and /usr/lib${LIBABISUFFIX}}) as it's always
+# automatically in the runtime library search path.
#
-_BLNK_PASSTHRU_RPATHDIRS:= ${_BLNK_PASSTHRU_RPATHDIRS:N/usr/lib}
+_BLNK_PASSTHRU_RPATHDIRS:= ${_BLNK_PASSTHRU_RPATHDIRS:N/usr/lib:N/usr/lib${LIBABISUFFIX}}
_BLNK_MANGLE_DIRS= # empty
_BLNK_MANGLE_DIRS+= ${BUILDLINK_DIR}