mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-12-04 15:13:58 +01:00
HBSD: Resolve merge conflict
Signed-off-by: Shawn Webb <shawn.webb@hardenedbsd.org>
This commit is contained in:
parent
49fc38d013
commit
79cc22167d
@ -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} \
|
||||
|
Loading…
Reference in New Issue
Block a user