Module Name: src
Committed By: christos
Date: Tue Apr 2 16:18:23 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
Back-out unintented commit.
To generate a diff of this commit:
cvs rdiff -u -r1.398 -r1.399 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.398 src/share/mk/bsd.lib.mk:1.399
--- src/share/mk/bsd.lib.mk:1.398 Tue Apr 2 12:17:29 2024
+++ src/share/mk/bsd.lib.mk Tue Apr 2 12:18:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.398 2024/04/02 16:17:29 christos Exp $
+# $NetBSD: bsd.lib.mk,v 1.399 2024/04/02 16:18:23 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -16,13 +16,9 @@ LIBISCXX?= no
.if ${LIBISMODULE} != "no"
_LIB_PREFIX?= # empty
MKDEBUGLIB:= no
-MKPROFILE:= no
-.if ${LIBISMODULE} != "pic"
MKPICINSTALL:= no
-MKLINKLIB:= no
+MKPROFILE:= no
MKSTATICLIB:= no
-.endif
-_LINKINSTALL?= no
_LINTINSTALL?= no
.else
_LIB_PREFIX?= lib
@@ -30,19 +26,17 @@ _LIB_PREFIX?= lib
.if ${LIBISPRIVATE} != "no"
MKDEBUGLIB:= no
-MKPROFILE:= no
MKPICINSTALL:= no
. if defined(NOSTATICLIB) && ${MKPICLIB} != "no"
MKSTATICLIB:= no
. elif ${LIBISPRIVATE} != "pic"
MKPIC:= no
. endif
-_LINKINSTALL?= no
+MKPROFILE:= no
_LINTINSTALL?= no
.endif
_LINTINSTALL?= ${MKLINT}
-_LINKINSTALL?= ${MKLINKLIB}
##### Basic targets
.PHONY: checkver libinstall
@@ -737,7 +731,7 @@ LIBCLEANFILES5+= ${_LIB.ln} ${LOBJS}
# Make sure it gets defined, in case MKPIC==no && MKLINKLIB==no
libinstall::
-.if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no" && ${_LINKINSTALL} != "no"
+.if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no"
libinstall:: ${_DEST.LIB}/${_LIB.a}
.PRECIOUS: ${_DEST.LIB}/${_LIB.a}
@@ -844,7 +838,7 @@ ${_DEST.OBJ}/${_LIB.so.full}: ${_LIB.so.
${_DEST.LIB}/${_LIB.so.major}
.endif
.endif
-.if ${MKLINKLIB} != "no" && ${_LINKINSTALL} != "no"
+.if ${MKLINKLIB} != "no"
${INSTALL_SYMLINK} ${_LIB.so.full} ${_DEST.OBJ}/${_LIB.so}
.if ${_LIBSODIR} != ${LIBDIR}
${INSTALL_SYMLINK} -l r ${_DEST.OBJ}/${_LIB.so.full} \
