Module Name: src
Committed By: christos
Date: Mon May 8 14:31:43 UTC 2023
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
Allow linking against archives like PROGDPLIBS does.
To generate a diff of this commit:
cvs rdiff -u -r1.390 -r1.391 src/share/mk/bsd.lib.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.390 src/share/mk/bsd.lib.mk:1.391
--- src/share/mk/bsd.lib.mk:1.390 Mon Feb 6 23:53:54 2023
+++ src/share/mk/bsd.lib.mk Mon May 8 10:31:43 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.390 2023/02/07 04:53:54 mrg Exp $
+# $NetBSD: bsd.lib.mk,v 1.391 2023/05/08 14:31:43 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -69,7 +69,13 @@ LIBDO.${_lib}!= cd "${_dir}" && ${PRINTO
LDADD+= -l${_lib}
.else
LDADD+= -L${LIBDO.${_lib}} -l${_lib}
-DPADD+= ${LIBDO.${_lib}}/lib${_lib}.so # Don't use _LIB_PREFIX
+.if exists(${LIBDO.${_lib}}/lib${_lib}_pic.a)
+DPADD+= ${LIBDO.${_lib}}/lib${_lib}_pic.a
+.elif exists(${LIBDO.${_lib}}/lib${_lib}.so)
+DPADD+= ${LIBDO.${_lib}}/lib${_lib}.so
+.else
+DPADD+= ${LIBDO.${_lib}}/lib${_lib}.a
+.endif
.endif
.endfor
.endif # }
