Date: Sun, 12 Dec 2021 18:28:58 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 10172d4fca70 - stable/12 - Move _p.a profiling archives under MK_INSTALLLIB Message-ID: <202112121828.1BCISw2R078727@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=10172d4fca7010c3bdc1e8dd2a4f5b6f8ece2421 commit 10172d4fca7010c3bdc1e8dd2a4f5b6f8ece2421 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2021-12-02 15:27:12 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2021-12-12 18:28:47 +0000 Move _p.a profiling archives under MK_INSTALLLIB _p.a are just a special case of .a archives, and should not be installed if WITHOUT_INSTALLLIB is set. MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit fc073e6743a989c9d0b8f619ce0f903271c0db2e) (cherry picked from commit 0421d8bdef00c710a38cb11547a91c8fde2c5c8c) --- share/mk/bsd.lib.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 1b98ad36280e..d99360f0e2bf 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -425,11 +425,11 @@ _libinstall: .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}.a ${DESTDIR}${_LIBDIR}/ -.endif -.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) +.if ${MK_PROFILE} != "no" ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},profile} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}_p.a ${DESTDIR}${_LIBDIR}/ .endif +.endif .if defined(SHLIB_NAME) ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112121828.1BCISw2R078727>