The branch main has been updated by arichardson:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c826e08841fbcc0ba0c5a78aa09d6ee22a95f2f9
commit c826e08841fbcc0ba0c5a78aa09d6ee22a95f2f9
Author: Alex Richardson <arichard...@freebsd.org>
AuthorDate: 2021-08-02 08:49:50 +0000
Commit: Alex Richardson <arichard...@freebsd.org>
CommitDate: 2021-08-02 13:33:24 +0000
Fix MK_TESTS build with MK_ASAN/MK_UBSAN
Reviewed By: markj
Differential Revision: https://reviews.freebsd.org/D31049
---
tests/sys/capsicum/Makefile | 6 ++++++
usr.sbin/rpcbind/tests/Makefile | 8 ++++++++
2 files changed, 14 insertions(+)
diff --git a/tests/sys/capsicum/Makefile b/tests/sys/capsicum/Makefile
index ded91803cf8a..1d2543b2ef4d 100644
--- a/tests/sys/capsicum/Makefile
+++ b/tests/sys/capsicum/Makefile
@@ -43,6 +43,12 @@ PROGS+= $p
NO_SHARED.$p=
SRCS.$p= mini-me.c
.endfor
+.if ${MK_ASAN} != "no" || ${MK_UBSAN} != "no"
+# mini-me.o is linked into a static binary so we can't use sanitizers.
+# Note: We have to set CFLAGS here since it will be built as part of
+# _PROGS_COMMON_OBJS and therefore NO_SHARED.$p does not disable ASAN/UBSAN.
+CFLAGS.mini-me.c+= -fno-sanitize=address -fno-sanitize=undefined
+.endif
BINDIR= ${TESTSDIR}
diff --git a/usr.sbin/rpcbind/tests/Makefile b/usr.sbin/rpcbind/tests/Makefile
index 515214763421..dae57a29fda7 100644
--- a/usr.sbin/rpcbind/tests/Makefile
+++ b/usr.sbin/rpcbind/tests/Makefile
@@ -14,4 +14,12 @@ CFLAGS+= -DINET6
WARNS?= 3
+.if ${MK_ASAN} != "no"
+# Work around "error: duplicate symbol: getifaddrs" when building with ASAN.
+# The ASAN interceptors also define getifaddrs, but we want to prefer the local
+# stub symbol here, so using a shared sanitizer runtime moves the local
+# definition first in the symbol resolution order.
+LDFLAGS+=-shared-libasan
+.endif
+
.include <bsd.test.mk>
_______________________________________________
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"
