summaryrefslogtreecommitdiff
path: root/libsanitizer/asan/Makefile.in
diff options
context:
space:
mode:
authorhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-29 19:15:43 +0000
committerhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-29 19:15:43 +0000
commit59bf8046f48799e106a87e3de98a32d0fd75938e (patch)
treed21d7681a82c47211119edbe74cfe5a34f900786 /libsanitizer/asan/Makefile.in
parentd0ea526aebc47a583571eca69b713170fcdb4467 (diff)
downloadgcc-59bf8046f48799e106a87e3de98a32d0fd75938e.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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193951 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer/asan/Makefile.in')
-rw-r--r--libsanitizer/asan/Makefile.in14
1 files changed, 4 insertions, 10 deletions
diff --git a/libsanitizer/asan/Makefile.in b/libsanitizer/asan/Makefile.in
index 681fe5e0a9b..e5e8d407c57 100644
--- a/libsanitizer/asan/Makefile.in
+++ b/libsanitizer/asan/Makefile.in
@@ -38,8 +38,7 @@ target_triplet = @target@
subdir = asan
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
- $(top_srcdir)/../config/depstand.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/../config/lead-dot.m4 \
$(top_srcdir)/../config/multi.m4 \
$(top_srcdir)/../config/override.m4 \
@@ -229,7 +228,6 @@ sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
-target_noncanonical = @target_noncanonical@
target_os = @target_os@
target_vendor = @target_vendor@
toolexecdir = @toolexecdir@
@@ -241,13 +239,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir)
# May be used by toolexeclibdir.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
-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 -Wno-c99-extensions \
- -I../../libstdc++-v3/include \
- -I../../libstdc++-v3/include/$(target_noncanonical) \
- -I$(srcdir)/../../libstdc++-v3/libsupc++
+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 -Wno-c99-extensions
ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config
toolexeclib_LTLIBRARIES = libasan.la
asan_files = \
@@ -305,6 +297,8 @@ AM_MAKEFLAGS = \
"includedir=$(includedir)" \
"AR=$(AR)" \
"AS=$(AS)" \
+ "CC=$(CC)" \
+ "CXX=$(CXX)" \
"LD=$(LD)" \
"LIBCFLAGS=$(LIBCFLAGS)" \
"NM=$(NM)" \