aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2026-05-01 12:19:17 +0000
committerKyle Evans <kevans@FreeBSD.org>2026-05-01 12:19:17 +0000
commit8583bcb5b400c4e4d18a563cd749ee9b23750e0a (patch)
tree0d1ac1d01b05f0b52b8c1743fa7b766ea53fabaa
parentf4ae41b7ea5efb8381a5df234b3f5e1f7569f9b0 (diff)
Revert "build: provide a FORTIFY_SOURCE.<src file> override"
This reverts commit c46a0b590716144d772eeba83ca88d96ee12c2f1. It broke the build and I'm not awake yet.
-rw-r--r--share/mk/bsd.sys.mk9
1 files changed, 3 insertions, 6 deletions
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 5bd8cd3362d1..93e7c8572310 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -321,12 +321,9 @@ SSP_CFLAGS?= -fstack-protector-strong
.endif
CFLAGS+= ${SSP_CFLAGS}
.endif # SSP
-
-.if empty(CFLAGS:M-D_FORTIFY_SOURCE*)
-CFLAGS+= -D_FORTIFY_SOURCE=${FORTIFY_SOURCE.${.IMPSRC:T}:U${FORTIFY_SOURCE}}
-.endif
-.if empty(CXXFLAGS:M-D_FORTIFY_SOURCE*)
-CXXFLAGS+= -D_FORTIFY_SOURCE=${FORTIFY_SOURCE.${.IMPSRC:T}:U${FORTIFY_SOURCE}}
+.if ${FORTIFY_SOURCE} > 0
+CFLAGS+= -D_FORTIFY_SOURCE=${FORTIFY_SOURCE}
+CXXFLAGS+= -D_FORTIFY_SOURCE=${FORTIFY_SOURCE}
.endif
# Additional flags passed in CFLAGS and CXXFLAGS when MK_DEBUG_FILES is