Browse Source

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>
gdb_7_4-branch
Mike Frysinger 15 years ago
parent
commit
506eb5219e
  1. 5
      binutils/ChangeLog
  2. 2
      binutils/Makefile.am
  3. 2
      binutils/Makefile.in

5
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> 2011-10-25 Joern Rennecke <joern.rennecke@embecosm.com>
* readelf.c: Include "elf/epiphany.h". * readelf.c: Include "elf/epiphany.h".

2
binutils/Makefile.am

@ -272,7 +272,7 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJEXT@ syslex.@OBJEXT@
syslex.@OBJEXT@: syslex.c sysinfo.h config.h syslex.@OBJEXT@: syslex.c sysinfo.h config.h
if [ -r syslex.c ]; then \ 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 \ else \
$(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex.c ;\ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex.c ;\
fi fi

2
binutils/Makefile.in

@ -1286,7 +1286,7 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJEXT@ syslex.@OBJEXT@
syslex.@OBJEXT@: syslex.c sysinfo.h config.h syslex.@OBJEXT@: syslex.c sysinfo.h config.h
if [ -r syslex.c ]; then \ 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 \ else \
$(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex.c ;\ $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex.c ;\
fi fi

Loading…
Cancel
Save