瀏覽代碼

HBSD: Resolve merge conflicts

Signed-off-by:	Shawn Webb <shawn.webb@hardenedbsd.org>
hardened/current/safestack
Shawn Webb 3 月之前
父節點
當前提交
b3b464e4e2
共有 4 個文件被更改,包括 6 次插入34 次删除
  1. +4
    -17
      Makefile.inc1
  2. +1
    -8
      share/man/man5/src.conf.5
  3. +0
    -5
      share/mk/src.opts.mk
  4. +1
    -4
      targets/pseudo/bootstrap-tools/Makefile

+ 4
- 17
Makefile.inc1 查看文件

@@ -675,15 +675,10 @@ BSARGS= DESTDIR= \
MK_HTML=no NO_LINT=yes MK_MAN=no \
-DNO_PIC MK_PROFILE=no -DNO_SHARED \
-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
<<<<<<< HEAD
MK_CLANG_EXTRAS=yes MK_CLANG_FULL=no \
MK_LLDB=no MK_TESTS=no \
MK_INCLUDES=yes MK_CFI=no MK_RETPOLINE=no
=======
MK_CLANG_EXTRAS=no MK_CLANG_FORMAT=no MK_CLANG_FULL=no \
MK_LLDB=no MK_RETPOLINE=no MK_TESTS=no \
MK_INCLUDES=yes
>>>>>>> internal/freebsd/current/master
MK_INCLUDES=yes MK_CFI=no MK_RETPOLINE=no \
MK_CLANG_FORMAT=no

BMAKE= \
${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
@@ -702,13 +697,9 @@ TMAKE= \
SSP_CFLAGS= \
-DNO_LINT \
-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
<<<<<<< HEAD
MK_CLANG_EXTRAS=yes MK_CLANG_FULL=no \
MK_LLDB=no MK_TESTS=no MK_CFI=no MK_RETPOLINE=no
=======
MK_CLANG_EXTRAS=no MK_CLANG_FORMAT=no MK_CLANG_FULL=no \
MK_LLDB=no MK_RETPOLINE=no MK_TESTS=no
>>>>>>> internal/freebsd/current/master
MK_LLDB=no MK_TESTS=no MK_CFI=no MK_RETPOLINE=no \
MK_CLANG_FORMAT=no

# cross-tools stage
# TOOLS_PREFIX set in BMAKE
@@ -2582,12 +2573,8 @@ NXBMAKEARGS+= \
-DNO_PIC \
SSP_CFLAGS= \
MK_CASPER=no \
<<<<<<< HEAD
MK_CLANG_EXTRAS=yes \
=======
MK_CLANG_EXTRAS=no \
MK_CLANG_FORMAT=no \
>>>>>>> internal/freebsd/current/master
MK_CLANG_FULL=no \
MK_CTF=no \
MK_DEBUG_FILES=no \


+ 1
- 8
share/man/man5/src.conf.5 查看文件

@@ -1,10 +1,6 @@
.\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
.\" $FreeBSD$
<<<<<<< HEAD
.Dd June 7, 2020
=======
.Dd June 24, 2020
>>>>>>> internal/freebsd/current/master
.Dd June 26, 2020
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -351,14 +347,11 @@ enabled unless an alternate compiler is provided via XCC.
.It Va WITH_CLANG_EXTRAS
Set to build additional clang and llvm tools, such as bugpoint and
clang-format.
<<<<<<< HEAD
.Pp
This is a default setting on
amd64/amd64 and arm64/aarch64.
=======
.It Va WITH_CLANG_FORMAT
Set to build clang-format.
>>>>>>> internal/freebsd/current/master
.It Va WITHOUT_CLANG_FULL
Set to avoid building the ARCMigrate, Rewriter and StaticAnalyzer components of
the Clang C/C++ compiler.


+ 0
- 5
share/mk/src.opts.mk 查看文件

@@ -202,13 +202,8 @@ __DEFAULT_NO_OPTIONS = \
BEARSSL \
BHYVE_SNAPSHOT \
BSD_GREP \
<<<<<<< HEAD
BSD_GREP_FASTMATCH \
DEVD_PIE \
=======
CLANG_EXTRAS \
CLANG_FORMAT \
>>>>>>> internal/freebsd/current/master
DTRACE_TESTS \
EXPERIMENTAL \
FREEBSD_UPDATE \


+ 1
- 4
targets/pseudo/bootstrap-tools/Makefile 查看文件

@@ -43,11 +43,8 @@ BSARGS= DESTDIR= \
MK_HTML=no NO_LINT=yes MK_MAN=no \
-DNO_PIC MK_PROFILE=no -DNO_SHARED \
-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
<<<<<<< HEAD
MK_CLANG_EXTRAS=yes MK_CLANG_FULL=no \
=======
MK_CLANG_EXTRAS=no MK_CLANG_FORMAT=no MK_CLANG_FULL=no \
>>>>>>> internal/freebsd/current/master
MK_CLANG_FORMAT=no
MK_LLDB=no MK_TESTS=no \
MK_INCLUDES=yes



Loading…
取消
儲存