Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Allow linking against archives like PROGDPLIBS does.



details:   https://anonhg.NetBSD.org/src/rev/2894a3c5033e
branches:  trunk
changeset: 374626:2894a3c5033e
user:      christos <christos%NetBSD.org@localhost>
date:      Mon May 08 14:31:43 2023 +0000

description:
Allow linking against archives like PROGDPLIBS does.

diffstat:

 share/mk/bsd.lib.mk |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r b30f2a3c335f -r 2894a3c5033e share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Mon May 08 14:31:08 2023 +0000
+++ b/share/mk/bsd.lib.mk       Mon May 08 14:31:43 2023 +0000
@@ -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                                                                 # }



Home | Main Index | Thread Index | Old Index