diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2012-11-29 19:01:17 +0000 |
|---|---|---|
| committer | H.J. Lu <hongjiu.lu@intel.com> | 2012-11-29 19:01:17 +0000 |
| commit | ced6dcba088be15f3b8164da99385ff45cdb8278 (patch) | |
| tree | 56ddf851e832c50ca15b7b735dd1d3b77e94bc56 /libsanitizer/interception/Makefile.am | |
| parent | 914623a47263aa93225e3a421e4f60e7bdd9f43f (diff) | |
Use explicit -I for libstdc++-v3 header files
* Makefile.am (AM_MAKEFLAGS): Remove CC and CXX.
* configure.ac (ACX_NONCANONICAL_TARGET): New.
* asan/Makefile.am (AM_CXXFLAGS): Add -I for libstdc++-v3 header
files.
(AM_MAKEFLAGS): Remove 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: https://gcc.gnu.org/svn/gcc/trunk@193949 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer/interception/Makefile.am')
| -rw-r--r-- | libsanitizer/interception/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libsanitizer/interception/Makefile.am b/libsanitizer/interception/Makefile.am index 029417f46e5..7669e8c4b45 100644 --- a/libsanitizer/interception/Makefile.am +++ b/libsanitizer/interception/Makefile.am @@ -5,6 +5,10 @@ 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 -Wno-c99-extensions +## 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 noinst_LTLIBRARIES = libinterception.la @@ -51,8 +55,6 @@ AM_MAKEFLAGS = \ "includedir=$(includedir)" \ "AR=$(AR)" \ "AS=$(AS)" \ - "CC=$(CC)" \ - "CXX=$(CXX)" \ "LD=$(LD)" \ "LIBCFLAGS=$(LIBCFLAGS)" \ "NM=$(NM)" \ |