hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-21 18:50:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

HBSD: Resolve merge conflicts

Browse Source 
Signed-off-by:	Shawn Webb <shawn.webb@hardenedbsd.org>
This commit is contained in:
Shawn Webb 2024-11-12 12:47:00 -07:00
parent c454fe6a2b
commit f3ad60380e
No known key found for this signature in database
5 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libclang_rt/Makefile.inc
View File

@ -10,11 +10,7 @@ LIBDIR= ${SANITIZER_LIBDIR}
SHLIBDIR= ${LIBDIR} SHLIBDIR= ${LIBDIR}
NO_PIC= NO_PIC=
<<<<<<< HEAD
MK_PROFILE= no
MK_LTOLIB= no MK_LTOLIB= no
=======
>>>>>>> internal/freebsd/current/main
MK_ASAN:= no MK_ASAN:= no
MK_SSP= no MK_SSP= no
MK_UBSAN:= no MK_UBSAN:= no

7
lib/libprocstat/Makefile
View File

@ -62,13 +62,6 @@ zfs/zfs_defs.o: .PHONY
@cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.o @cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.o
zfs/zfs_defs.pico: .PHONY zfs/zfs_defs.pico: .PHONY
@cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.pico @cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.pico
<<<<<<< HEAD
zfs/zfs_defs.po: .PHONY
@cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.po
=======
zfs/zfs_defs.pieo: .PHONY
@cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.pieo
>>>>>>> internal/freebsd/current/main
.endif .endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

5
share/mk/bsd.opts.mk
View File

@ -76,11 +76,6 @@ __DEFAULT_NO_OPTIONS = \
CCACHE_BUILD \ CCACHE_BUILD \
CTF \ CTF \
INSTALL_AS_USER \ INSTALL_AS_USER \
<<<<<<< HEAD
PROFILE \
=======
RETPOLINE \
>>>>>>> internal/freebsd/current/main
STALE_STAGED \ STALE_STAGED \
UBSAN \ UBSAN \
UNDEFINED_VERSION UNDEFINED_VERSION

4
stand/defs.mk
View File

@ -10,12 +10,8 @@ FORTIFY_SOURCE= 0
MK_CTF= no MK_CTF= no
MK_SSP= no MK_SSP= no
<<<<<<< HEAD
MK_PROFILE= no
MK_SPECTREV1_FIX= no MK_SPECTREV1_FIX= no
MK_LTOLIB= no MK_LTOLIB= no
=======
>>>>>>> internal/freebsd/current/main
MK_PIE= no MK_PIE= no
MAN= MAN=
.if !defined(PIC) .if !defined(PIC)

5
targets/pseudo/bootstrap-tools/Makefile
View File

@ -47,11 +47,6 @@ BSARGS= DESTDIR= \
MK_CLANG_FULL=no \ MK_CLANG_FULL=no \
MK_HTML=no \ MK_HTML=no \
MK_MAN=no \ MK_MAN=no \
<<<<<<< HEAD
MK_PROFILE=no \
=======
MK_RETPOLINE=no \
>>>>>>> internal/freebsd/current/main
MK_SSP=no \ MK_SSP=no \
MK_TESTS=no \ MK_TESTS=no \
MK_WERROR=no \ MK_WERROR=no \