Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/lib/libc/misc Fix build of t_ubsan/t_ubsanxx under MKS...



details:   https://anonhg.NetBSD.org/src/rev/dcaa2d2db03c
branches:  trunk
changeset: 1002778:dcaa2d2db03c
user:      kamil <kamil%NetBSD.org@localhost>
date:      Thu Aug 15 08:17:32 2019 +0000

description:
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.

diffstat:

 tests/lib/libc/misc/Makefile |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 82632bfa146e -r dcaa2d2db03c tests/lib/libc/misc/Makefile
--- a/tests/lib/libc/misc/Makefile      Thu Aug 15 08:02:32 2019 +0000
+++ b/tests/lib/libc/misc/Makefile      Thu Aug 15 08:17:32 2019 +0000
@@ -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_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 :}



Home | Main Index | Thread Index | Old Index