summaryrefslogtreecommitdiff
path: root/libsanitizer/tsan/Makefile.am
diff options
context:
space:
mode:
authorH.J. Lu <hongjiu.lu@intel.com>2012-11-29 19:15:43 +0000
committerH.J. Lu <hjl@gcc.gnu.org>2012-11-29 11:15:43 -0800
commita23ed040bbd828f7ce578ec0dc510ee0a5197a50 (patch)
treed21d7681a82c47211119edbe74cfe5a34f900786 /libsanitizer/tsan/Makefile.am
parent99319980d372262c0ee79ca2eaef470e4621aed6 (diff)
downloadgcc-a23ed040bbd828f7ce578ec0dc510ee0a5197a50.tar.gz
Don't use -I for libstdc++-v3 header files
* Makefile.am (AM_MAKEFLAGS): Restore CC and CXX. * configure.ac (ACX_NONCANONICAL_TARGET): Removed. * asan/Makefile.am (AM_CXXFLAGS): Remove -I for libstdc++-v3 header files. (AM_MAKEFLAGS): Restore CC and CXX. * interception/Makefile.am: Likewise. * sanitizer_common/Makefile.am: Likewise. * tsan/Makefile.am: Likewise. * Makefile.in: Regenerated. * aclocal.m4: Likewise. * configure: Likewise. * asan/Makefile.in: Likewise. * interception/Makefile.in: Likewise. * sanitizer_common/Makefile.in: Likewise. * tsan/Makefile.in: Likewise. From-SVN: r193951
Diffstat (limited to 'libsanitizer/tsan/Makefile.am')
-rw-r--r--libsanitizer/tsan/Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/libsanitizer/tsan/Makefile.am b/libsanitizer/tsan/Makefile.am
index 6a4bf75c51b..a3919863ee7 100644
--- a/libsanitizer/tsan/Makefile.am
+++ b/libsanitizer/tsan/Makefile.am
@@ -5,10 +5,6 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fvisibility=hidden -Wno-variadic-macros
-## We require libstdc++-v3 to be in the same build tree.
-AM_CXXFLAGS += -I../../libstdc++-v3/include \
- -I../../libstdc++-v3/include/$(target_noncanonical) \
- -I$(srcdir)/../../libstdc++-v3/libsupc++
ACLOCAL_AMFLAGS = -I m4
toolexeclib_LTLIBRARIES = libtsan.la
@@ -71,6 +67,8 @@ AM_MAKEFLAGS = \
"includedir=$(includedir)" \
"AR=$(AR)" \
"AS=$(AS)" \
+ "CC=$(CC)" \
+ "CXX=$(CXX)" \
"LD=$(LD)" \
"LIBCFLAGS=$(LIBCFLAGS)" \
"NM=$(NM)" \