summaryrefslogtreecommitdiff
path: root/libsanitizer/Makefile.in
diff options
context:
space:
mode:
authorMarek Polacek <mpolacek@gcc.gnu.org>2013-08-30 16:12:58 +0000
committerMarek Polacek <mpolacek@gcc.gnu.org>2013-08-30 16:12:58 +0000
commitde5a5fa1395db2cb5da4d0593fef40ec22378576 (patch)
tree23d42aa647cb7a2de96792b724ecaaddee3423fa /libsanitizer/Makefile.in
parentf07f30cfb5efe0806dedaea03b56c574da1b372c (diff)
Merge ubsan into trunk.
From-SVN: r202113
Diffstat (limited to 'libsanitizer/Makefile.in')
-rw-r--r--libsanitizer/Makefile.in8
1 files changed, 4 insertions, 4 deletions
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