Module Name:    src
Committed By:   kamil
Date:           Thu Aug 15 08:17:32 UTC 2019

Modified Files:
        src/tests/lib/libc/misc: Makefile

Log Message:
Fix build of t_ubsan/t_ubsanxx under MKSANITIZER

Do not link micro-ubsan runtime for disabled tests.

This avoids double symbols linked into a single binary.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/misc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/lib/libc/misc/Makefile
diff -u src/tests/lib/libc/misc/Makefile:1.3 src/tests/lib/libc/misc/Makefile:1.4
--- src/tests/lib/libc/misc/Makefile:1.3	Mon Feb  4 03:10:33 2019
+++ src/tests/lib/libc/misc/Makefile	Thu Aug 15 08:17:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/02/04 03:10:33 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2019/08/15 08:17:32 kamil Exp $
 
 .include <bsd.own.mk>
 
@@ -8,13 +8,15 @@ TESTS_C+=	t_ubsan
 TESTS_CXX+=	t_ubsanxx
 
 .PATH:		${NETBSDSRCDIR}/common/lib/libc/misc
-SRCS.t_ubsan=	t_ubsan.c ubsan.c
-SRCS.t_ubsanxx=	t_ubsanxx.cpp ubsan.c
+SRCS.t_ubsan=	t_ubsan.c
+SRCS.t_ubsanxx=	t_ubsanxx.cpp
 
 .if ${MKSANITIZER:Uno} != "yes" && ${MKLIBCSANITIZER:Uno} != "yes"
 # These tests are designed to be used against micro-UBSan only.
 # micro-UBSan is used in these tests as a standalone libary only.
 CPPFLAGS+=		-DENABLE_TESTS
+SRCS.t_ubsan+=		ubsan.c
+SRCS.t_ubsanxx+=	ubsan.c
 UBSAN_FLAGS=		-fsanitize=undefined
 UBSAN_FLAGS+=		${${ACTIVE_CC} == "clang" :? -fsanitize=integer :}
 UBSAN_FLAGS+=		${${ACTIVE_CC} == "clang" :? -fsanitize=nullability :}

Reply via email to