Commit 1c61e9d0 authored by Shawn Webb's avatar Shawn Webb
Browse files

HBSD: Resolve merge conflict


Signed-off-by: Shawn Webb's avatarShawn Webb <shawn.webb@hardenedbsd.org>
parent 31367a11
.\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
.\" $FreeBSD$
<<<<<<< HEAD
.Dd January 7, 2022
=======
.Dd May 2, 2022
>>>>>>> origin/hardened/current/master
.Dd May 16, 2022
.Dt SRC.CONF 5
.Os
.Sh NAME
......@@ -562,11 +558,6 @@ When set, it enforces these options:
.It
.Va WITHOUT_OPENMP
.It
<<<<<<< HEAD
=======
.Va WITHOUT_PMC
.It
>>>>>>> origin/hardened/current/master
.Va WITHOUT_TESTS
.El
.Pp
......@@ -1127,20 +1118,12 @@ amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64, riscv/riscv64 and riscv/riscv6
Do not build kboot, a linuxboot environment loader
.Pp
This is a default setting on
<<<<<<< HEAD
amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64, powerpc/powerpc, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf.
=======
arm/armv6, arm/armv7, arm64/aarch64, powerpc/powerpc, powerpc/powerpc64le, riscv/riscv64 and riscv/riscv64sf.
>>>>>>> origin/hardened/current/master
.It Va WITH_LOADER_KBOOT
Build kboot, a linuxboot environment loader
.Pp
This is a default setting on
<<<<<<< HEAD
powerpc/powerpc64.
=======
amd64/amd64 and powerpc/powerpc64.
>>>>>>> origin/hardened/current/master
.It Va WITHOUT_LOADER_LUA
Do not build LUA bindings for the boot loader.
.Pp
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment