[libsanitizer,comitted] Fix PR bootstrap/91455
diff mbox series

Message ID 1535D0FE-5E77-471D-B332-358FD4D6E945@googlemail.com
State New
Headers show
Series
  • [libsanitizer,comitted] Fix PR bootstrap/91455
Related show

Commit Message

Iain Sandoe Aug. 15, 2019, 2:18 p.m. UTC
If a target does not support libbacktrace, it might still need the include
for $(top_srcdir).

Regenerate the built files using automake-1.15.1

bootstrapped on x86_64-darwin16, x86_64-linux-gnu and
powerpc64-linux-gnu (with a fix for pr90639 applied for this).
Iain

libsanitizer/

2019-08-15  Iain Sandoe  <iain@sandoe.co.uk>

	PR bootstrap/91455
	* Makefile.in: Regenerated.
	* aclocal.m4: Likewise.
	* asan/Makefile.in: Likewise.
	* configure: Likewise.
	* interception/Makefile.in: Likewise.
	* libbacktrace/Makefile.in: Likewise.
	* lsan/Makefile.in: Likewise.
	* sanitizer_common/Makefile.am: Include top_srcdir unconditionally.
	* sanitizer_common/Makefile.in: Regenerated.
	* tsan/Makefile.in: Likewise.
	* ubsan/Makefile.in: Likewise.

Patch
diff mbox series

diff --git a/libsanitizer/sanitizer_common/Makefile.am b/libsanitizer/sanitizer_common/Makefile.am
index 7e8ce9476e..df9c294151 100644
--- a/libsanitizer/sanitizer_common/Makefile.am
+++ b/libsanitizer/sanitizer_common/Makefile.am
@@ -1,4 +1,4 @@ 
-AM_CPPFLAGS = -I $(top_srcdir)/include -isystem $(top_srcdir)/include/system
+AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir) -isystem $(top_srcdir)/include/system
 
 # May be used by toolexeclibdir.
 gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
@@ -10,7 +10,6 @@  AM_CXXFLAGS += -std=gnu++11
 AM_CXXFLAGS += $(EXTRA_CXXFLAGS)
 if LIBBACKTRACE_SUPPORTED
 AM_CXXFLAGS += -DSANITIZER_LIBBACKTRACE -DSANITIZER_CP_DEMANGLE \
-              -I $(top_srcdir)/ \
               -I $(top_srcdir)/../libbacktrace \
               -I $(top_builddir)/libbacktrace \
               -I $(top_srcdir)/../include \