aboutsummaryrefslogtreecommitdiff
path: root/libbacktrace
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@google.com>2012-09-19 04:37:40 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2012-09-19 04:37:40 +0000
commit9425c00b8ed849698869d1dc4372151c2a3a7cc3 (patch)
treee8cd01f51f4359d50177b7f99ba1531323deb83e /libbacktrace
parent467d90329decd6f73978e1090a15b9c1de3cc507 (diff)
downloadgcc-9425c00b8ed849698869d1dc4372151c2a3a7cc3.zip
gcc-9425c00b8ed849698869d1dc4372151c2a3a7cc3.tar.gz
gcc-9425c00b8ed849698869d1dc4372151c2a3a7cc3.tar.bz2
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
Diffstat (limited to 'libbacktrace')
-rw-r--r--libbacktrace/ChangeLog7
-rw-r--r--libbacktrace/Makefile.am5
-rw-r--r--libbacktrace/Makefile.in5
3 files changed, 15 insertions, 2 deletions
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index 15a9439..814a1c9 100644
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,5 +1,12 @@
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.
(backtrace_open): Pass O_BINARY to open. Only call fcntl if
HAVE_FCNTL is defined.
diff --git a/libbacktrace/Makefile.am b/libbacktrace/Makefile.am
index 0cbed3b..2492ca2 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 d53ea32..f041b57 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 \