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.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libsanitizer/Makefile.in') diff --git a/libsanitizer/Makefile.in b/libsanitizer/Makefile.in index 125692eb332..286cea61138 100644 --- a/libsanitizer/Makefile.in +++ b/libsanitizer/Makefile.in @@ -76,7 +76,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = interception sanitizer_common asan tsan +DIST_SUBDIRS = interception sanitizer_common asan ubsan tsan ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AR = @AR@ @@ -209,9 +209,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I .. -I ../config -@TSAN_SUPPORTED_FALSE@SUBDIRS = interception sanitizer_common asan -@TSAN_SUPPORTED_TRUE@SUBDIRS = interception sanitizer_common asan tsan -@USING_MAC_INTERPOSE_TRUE@SUBDIRS = sanitizer_common asan +@TSAN_SUPPORTED_FALSE@SUBDIRS = interception sanitizer_common asan ubsan +@TSAN_SUPPORTED_TRUE@SUBDIRS = interception sanitizer_common asan tsan ubsan +@USING_MAC_INTERPOSE_TRUE@SUBDIRS = sanitizer_common asan ubsan # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and -- cgit v1.2.1