aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-10-25 20:39:41 +0000
committerMike Frysinger <vapier@gentoo.org>2011-10-25 20:39:41 +0000
commit506eb5219ebf3275c7e5e679c698d0cf29bf3d96 (patch)
treebe7395fe3b7fe87e861bac8dcfffc860da7bc9b2 /binutils
parent214ce7b58a5e6526bd9fcfe7e7893e2b915f75fd (diff)
downloadfsf-binutils-gdb-506eb5219ebf3275c7e5e679c698d0cf29bf3d96.zip
fsf-binutils-gdb-506eb5219ebf3275c7e5e679c698d0cf29bf3d96.tar.gz
fsf-binutils-gdb-506eb5219ebf3275c7e5e679c698d0cf29bf3d96.tar.bz2
binutils: fix out of tree building with syslex regens
If you take a release tarball (which has pregenerated syslex and sysinfo files in it), apply some patches which touch syslex.l, and then build the result out of tree, it will fail. This is because syslex.l uses sysinfo.h, but the sysinfo.y file wasn't updated and so it wasn't regenerated (the files are found in the $srcdir), and the build rule for syslex.c does not use -I$(srcdir) when it finds a local file. Simple fix below. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog5
-rw-r--r--binutils/Makefile.am2
-rw-r--r--binutils/Makefile.in2
3 files changed, 7 insertions, 2 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 4393798..e483ac8 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-25 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.am (syslex.@OBJEXT@): Add -I$(srcdir).
+ * Makefile.in: Regen.
+
2011-10-25 Joern Rennecke <joern.rennecke@embecosm.com>
* readelf.c: Include "elf/epiphany.h".
diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index bbe58e2..59f759f 100644
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -272,7 +272,7 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJEXT@ syslex.@OBJEXT@
syslex.@OBJEXT@: syslex.c sysinfo.h config.h
if [ -r syslex.c ]; then \
- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \
+ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \
else \
$(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex.c ;\
fi
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 9f10781..9fe5642 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -1286,7 +1286,7 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJEXT@ syslex.@OBJEXT@
syslex.@OBJEXT@: syslex.c sysinfo.h config.h
if [ -r syslex.c ]; then \
- $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \
+ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) syslex.c ; \
else \
$(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex.c ;\
fi