Commit 985587d2 authored by Loic's avatar Loic
Browse files

Merge branch 'EXCLUDE_SAFESTACK' into 'hardenedbsd/main'

HBSD: compile fix for *-static ports

See merge request hardenedbsd/ports!111
parents 5e2ffe37 a192f6c5
......@@ -222,11 +222,9 @@ OPTIONS_GROUP_HARDENING+=RELRO
safestack_ARGS?=
.if ${safestack_ARGS:Mauto}
.if ${_USE_HARDENING:Mstatic}
safestack_ARGS+= off
.endif
.endif
SAFESTACK_DESC= Build with SafeStack
SAFESTACK_USES= safestack
......@@ -261,11 +259,9 @@ OPTIONS_GROUP_HARDENING+=SAFESTACK
cfi_ARGS?=
.if ${cfi_ARGS:Mauto}
.if ${_USE_HARDENING:Mstatic}
cfi_ARGS+= off
.endif
.endif
CFI_DESC= Build with Control Flow Integrity
CFI_USES= cfi
......
......@@ -22,6 +22,7 @@ COMMENT+= (rescue(8) version)
HAS_CONFIGURE= yes
.if ${FLAVOR} == static
CONFIGURE_ARGS+= --enable-static
OPTIONS_EXCLUDE= SAFESTACK PIE
PLIST= /dev/null
PLIST_FILES= "@shell /rescue/oksh"
.endif
......
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