From 5ea556d98ce7971950c11bc7102dc57ed4f7711b Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Wed, 1 Apr 2020 05:45:12 +0000 Subject: [PATCH] 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 --- lib/libveriexec/Makefile | 2 +- share/mk/src.libnames.mk | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libveriexec/Makefile b/lib/libveriexec/Makefile index 31f35f3592d5..2c68faf3356f 100644 --- a/lib/libveriexec/Makefile +++ b/lib/libveriexec/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include LIB= veriexec MAN= veriexec.3 diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index ac16e1a87bf2..665e33d95975 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -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