HBSD: Resolve merge conflict

Signed-off-by:	Shawn Webb <shawn.webb@hardenedbsd.org>
This commit is contained in:
Shawn Webb 2022-02-03 09:15:25 -05:00
parent 49fc38d013
commit 79cc22167d

View File

@ -27,15 +27,11 @@ LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \
-DNO_CPU_CFLAGS \
MK_BOOT=no \
MK_CTF=no \
<<<<<<< HEAD
-DNO_LINT \
MK_CFI=no \
MK_LTOLIB=no \
MK_SAFESTACK=no \
MK_SPECTREV1_FIX=no \
MK_RETPOLINE=no \
=======
>>>>>>> origin/freebsd/current/main
MK_TESTS=no
LIBCOMPATWMAKE+= ${TIME_ENV} ${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \
OBJTOP=${LIBCOMPAT_OBJTOP} \