svn commit: r359502 - in head: lib/libveriexec share/mk
Simon J. Gerraty
sjg at FreeBSD.org
Wed Apr 1 05:45:22 UTC 2020
Author: sjg
Date: Wed Apr 1 05:45:12 2020
New Revision: 359502
URL: https://svnweb.freebsd.org/changeset/base/359502
Log:
Do not claim libbearssl et al are INTERNALLIB
If INTERNALLIB is defined we need PIE and bsd.incs.mk is
not included.
PR: 245189
Reviewed by: emaste
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org//D24233
Modified:
head/lib/libveriexec/Makefile
head/share/mk/src.libnames.mk
Modified: head/lib/libveriexec/Makefile
==============================================================================
--- head/lib/libveriexec/Makefile Wed Apr 1 04:51:39 2020 (r359501)
+++ head/lib/libveriexec/Makefile Wed Apr 1 05:45:12 2020 (r359502)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= veriexec
MAN= veriexec.3
Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk Wed Apr 1 04:51:39 2020 (r359501)
+++ head/share/mk/src.libnames.mk Wed Apr 1 05:45:12 2020 (r359502)
@@ -222,18 +222,18 @@ _LIBRARIES+= \
.endif
.if ${MK_BEARSSL} == "yes"
-_INTERNALLIBS+= \
+_LIBRARIES+= \
bearssl \
secureboot \
-LIBBEARSSL?= ${LIBBEARSSLDIR}/libbearssl${PIE_SUFFIX}.a
-LIBSECUREBOOT?= ${LIBSECUREBOOTDIR}/libsecureboot${PIE_SUFFIX}.a
+LIBBEARSSL?= ${LIBBEARSSLDIR}/libbearssl.a
+LIBSECUREBOOT?= ${LIBSECUREBOOTDIR}/libsecureboot.a
.endif
.if ${MK_VERIEXEC} == "yes"
-_INTERNALLIBS+= veriexec
+_LIBRARIES+= veriexec
-LIBVERIEXEC?= ${LIBVERIEXECDIR}/libveriexec${PIE_SUFFIX}.a
+LIBVERIEXEC?= ${LIBVERIEXECDIR}/libveriexec.a
.endif
# Each library's LIBADD needs to be duplicated here for static linkage of
More information about the svn-src-head
mailing list