d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not claim libbearssl et al are INTERNALLIB

Browse Source 
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
This commit is contained in:
Simon J. Gerraty 2020-04-01 05:45:12 +00:00
parent 8abaf6a7c8
commit 5ea556d98c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libveriexec/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
.include <bsd.own.mk> .include <src.opts.mk>
LIB= veriexec LIB= veriexec
MAN= veriexec.3 MAN= veriexec.3

10
share/mk/src.libnames.mk
View File

@ -222,18 +222,18 @@ _LIBRARIES+= \
.endif .endif
.if ${MK_BEARSSL} == "yes" .if ${MK_BEARSSL} == "yes"
_INTERNALLIBS+= \ _LIBRARIES+= \
bearssl \ bearssl \
secureboot \ secureboot \
LIBBEARSSL?= ${LIBBEARSSLDIR}/libbearssl${PIE_SUFFIX}.a LIBBEARSSL?= ${LIBBEARSSLDIR}/libbearssl.a
LIBSECUREBOOT?= ${LIBSECUREBOOTDIR}/libsecureboot${PIE_SUFFIX}.a LIBSECUREBOOT?= ${LIBSECUREBOOTDIR}/libsecureboot.a
.endif .endif
.if ${MK_VERIEXEC} == "yes" .if ${MK_VERIEXEC} == "yes"
_INTERNALLIBS+= veriexec _LIBRARIES+= veriexec
LIBVERIEXEC?= ${LIBVERIEXECDIR}/libveriexec${PIE_SUFFIX}.a LIBVERIEXEC?= ${LIBVERIEXECDIR}/libveriexec.a
.endif .endif
# Each library's LIBADD needs to be duplicated here for static linkage of # Each library's LIBADD needs to be duplicated here for static linkage of