From a96132f29aa3dfe94141a87537f62ea73ce0fc19 Mon Sep 17 00:00:00 2001
From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 23 Nov 2012 00:31:54 +0000
Subject: 	* tsan/Makefile.am (AM_CXXFLAGS): Remove -Wno-variadic-macros.
 	* Makefile.am (SUBDIRS): Guard tsan addition with TSAN_SUPPORTED 
 automake conditional instead of !MULTISUBDIR32. 	* configure.tgt: Set
 TSAN_SUPPORTED=yes for x86_64/i686-linux 	for 64-bit multilib. 	*
 configure.ac: Check for void * size, source in configure.tgt, 	define
 TSAN_SUPPORTED conditional instead of MULTILIBDIR32. 	* configure:
 Regenerated. 	* Makefile.in: Regenerated. 	* tsan/Makefile.in:
 Regenerated.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193741 138bc75d-0d04-0410-961f-82ee72b054a4
---
 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 d2192b2d38f..64d3d2eab9a 100644
--- a/libsanitizer/Makefile.am
+++ b/libsanitizer/Makefile.am
@@ -1,9 +1,9 @@
 ACLOCAL_AMFLAGS = -I .. -I ../config
 
-if MULTISUBDIR32 
-SUBDIRS = interception sanitizer_common asan 
-else
+if TSAN_SUPPORTED
 SUBDIRS = interception sanitizer_common asan tsan 
+else
+SUBDIRS = interception sanitizer_common asan 
 endif
 
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
-- 
cgit v1.2.1