From a0c4531a55c86a40b65cdc7af80473856d029a2e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 4 May 2021 08:45:46 -0600 Subject: Fix igen build The igen build fails for me like: gcc -g -O2 -c ../../binutils-gdb/sim/igen/igen.c -o igen/igen.o In file included from ../../binutils-gdb/sim/igen/igen.c:26: ../../binutils-gdb/sim/igen/lf.h:22:10: fatal error: ansidecl.h: No such file or directory This patch fixes the problem by arranging for igen to find the libiberty includes. This seems slightly hacky to me, because libiberty is not a "build" library, so it can't be linked against. However, since igen currently only includes the header, it seems relatively safe. 2021-05-04 Tom Tromey * Makefile.in: Rebuild. * Makefile.am (AM_CPPFLAGS): New variable. --- sim/ChangeLog | 5 +++++ sim/Makefile.am | 2 ++ sim/Makefile.in | 1 + 3 files changed, 8 insertions(+) diff --git a/sim/ChangeLog b/sim/ChangeLog index a26cae9..16bca69 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,8 @@ +2021-05-04 Tom Tromey + + * Makefile.in: Rebuild. + * Makefile.am (AM_CPPFLAGS): New variable. + 2021-05-04 Mike Frysinger * m4/sim_ac_toolchain.m4 (SIM_AC_TOOLCHAIN): Define AR_FOR_BUILD and diff --git a/sim/Makefile.am b/sim/Makefile.am index a68a964..6696adc 100644 --- a/sim/Makefile.am +++ b/sim/Makefile.am @@ -35,6 +35,8 @@ CLEANFILES = DISTCLEANFILES = MOSTLYCLEANFILES = core +AM_CPPFLAGS = -I$(srcroot)/include + COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS) $(CFLAGS_FOR_BUILD) LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ diff --git a/sim/Makefile.in b/sim/Makefile.in index 890adab..5c997b0 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -682,6 +682,7 @@ CLEANFILES = testsuite/common/bits-gen testsuite/common/bits32m0.c \ DISTCLEANFILES = MOSTLYCLEANFILES = core $(am__append_3) site-srcdir.exp testrun.log \ testrun.sum +AM_CPPFLAGS = -I$(srcroot)/include COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS) $(CFLAGS_FOR_BUILD) LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ @SIM_ENABLE_IGEN_TRUE@igen_libigen_a_SOURCES = \ -- cgit v1.1