The branch main has been updated by arichardson:
URL:
https://cgit.FreeBSD.org/src/commit/?id=428a32edba4c3bf3cfc0e4cf240c1b29397ecdbb
commit 428a32edba4c3bf3cfc0e4cf240c1b29397ecdbb
Author: Alex Richardson <arichard...@freebsd.org>
AuthorDate: 2021-08-03 09:37:28 +0000
Commit: Alex Richardson <arichard...@freebsd.org>
CommitDate: 2021-08-03 09:38:20 +0000
Use .sinclude for bsd.sanitizer.mk
We don't install this file since MK_ASAN/MK_UBSAN is only supported for
src builds. However, some ports also use bsd.lib.mk/bsd.prog.mk so we
should not fail the build if it can't be included.
Reported by: jkim
Fixes: 7bc797e3f380 ("Add build system support for ASAN+UBSAN
instrumentation")
---
share/mk/bsd.lib.mk | 3 ++-
share/mk/bsd.prog.mk | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 5de74b6fa056..aaac0b68d984 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -108,7 +108,8 @@ CXXFLAGS+= -ftrivial-auto-var-init=pattern
.endif
.endif
-.include "bsd.sanitizer.mk"
+# bsd.sanitizer.mk is not installed, so don't require it (e.g. for ports).
+.sinclude "bsd.sanitizer.mk"
.if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
empty(DEBUG_FLAGS:M-gdwarf*)
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 96d72daf2611..4f00be193874 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -81,7 +81,8 @@ CXXFLAGS+= -ftrivial-auto-var-init=pattern
.endif
.endif
-.include "bsd.sanitizer.mk"
+# bsd.sanitizer.mk is not installed, so don't require it (e.g. for ports).
+.sinclude "bsd.sanitizer.mk"
.if ${MACHINE_CPUARCH} == "riscv" && ${LINKER_FEATURES:Mriscv-relaxations} ==
""
CFLAGS += -mno-relax
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
