From patchwork Wed Sep 19 04:38:47 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: libbacktrace patch committed: Add more -I options
Date: Tue, 18 Sep 2012 18:38:47 -0000
From: Ian Taylor <iant@google.com>
X-Patchwork-Id: 184930
Message-Id: <mcrehlyr5ig.fsf@google.com>
To: gcc-patches@gcc.gnu.org

This patch to the libbacktrace Makefile.am adds some more -I options, so
that it can find unwind.h under more conditions.  This splits the -I
options in AM_CPPFLAGS, which is where they belong anyhow.  Bootstrapped
and ran libbacktrace tests on x86_64-unknown-linux-gnu.  Committed to
mainline.

Ian


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.


Index: Makefile.am
===================================================================
--- Makefile.am	(revision 191432)
+++ Makefile.am	(working copy)
@@ -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