From de5a5fa1395db2cb5da4d0593fef40ec22378576 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Fri, 30 Aug 2013 16:12:58 +0000 Subject: Merge ubsan into trunk. From-SVN: r202113 --- libsanitizer/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libsanitizer/Makefile.am') diff --git a/libsanitizer/Makefile.am b/libsanitizer/Makefile.am index 308d438074a..739c33babbe 100644 --- a/libsanitizer/Makefile.am +++ b/libsanitizer/Makefile.am @@ -1,13 +1,13 @@ ACLOCAL_AMFLAGS = -I .. -I ../config if TSAN_SUPPORTED -SUBDIRS = interception sanitizer_common asan tsan +SUBDIRS = interception sanitizer_common asan tsan ubsan else -SUBDIRS = interception sanitizer_common asan +SUBDIRS = interception sanitizer_common asan ubsan endif if USING_MAC_INTERPOSE -SUBDIRS = sanitizer_common asan +SUBDIRS = sanitizer_common asan ubsan endif # Work around what appears to be a GNU make bug handling MAKEFLAGS -- cgit v1.2.3