From 9425c00b8ed849698869d1dc4372151c2a3a7cc3 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor <iant@google.com> Date: Wed, 19 Sep 2012 04:37:40 +0000 Subject: [PATCH] re PR bootstrap/54623 (install fails with libbacktrace/backtrace.c:35:20: error: unwind.h: No such file or directory) PR bootstrap/54623 * Makefile.am (AM_CPPFLAGS): Define. (AM_CFLAGS): Remove -I options. * Makefile.in: Rebuild. From-SVN: r191459 --- libbacktrace/ChangeLog | 7 +++++++ libbacktrace/Makefile.am | 5 ++++- libbacktrace/Makefile.in | 5 ++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index 15a94391a1e4..814a1c92b91f 100644 --- a/libbacktrace/ChangeLog +++ b/libbacktrace/ChangeLog @@ -1,3 +1,10 @@ +2012-09-18 Ian Lance Taylor <iant@google.com> + + PR bootstrap/54623 + * Makefile.am (AM_CPPFLAGS): Define. + (AM_CFLAGS): Remove -I options. + * Makefile.in: Rebuild. + 2012-09-18 Ian Lance Taylor <iant@google.com> * posix.c (O_BINARY): Define if not defined. diff --git a/libbacktrace/Makefile.am b/libbacktrace/Makefile.am index 0cbed3b83456..2492ca2cc278 100644 --- a/libbacktrace/Makefile.am +++ b/libbacktrace/Makefile.am @@ -31,7 +31,10 @@ ACLOCAL_AMFLAGS = -I .. -I ../config -AM_CFLAGS = $(WARN_FLAGS) $(PIC_FLAG) -I $(srcdir)/../include -I ../libgcc +AM_CPPFLAGS = -I $(top_srcdir)/../include -I $(top_srcdir)/../libgcc \ + -I ../libgcc -I ../gcc/include -I $(MULTIBUILDTOP)../../gcc/include + +AM_CFLAGS = $(WARN_FLAGS) $(PIC_FLAG) noinst_LTLIBRARIES = libbacktrace.la diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in index d53ea32cc900..f041b5715d18 100644 --- a/libbacktrace/Makefile.in +++ b/libbacktrace/Makefile.in @@ -256,7 +256,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I .. -I ../config -AM_CFLAGS = $(WARN_FLAGS) $(PIC_FLAG) -I $(srcdir)/../include -I ../libgcc +AM_CPPFLAGS = -I $(top_srcdir)/../include -I $(top_srcdir)/../libgcc \ + -I ../libgcc -I ../gcc/include -I $(MULTIBUILDTOP)../../gcc/include + +AM_CFLAGS = $(WARN_FLAGS) $(PIC_FLAG) noinst_LTLIBRARIES = libbacktrace.la libbacktrace_la_SOURCES = \ backtrace.h \ -- GitLab