diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-10-25 20:39:40 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-10-25 20:39:40 +0000 |
| commit | c8704f69dffd3dd4200a00408b76009bcd3be62d (patch) | |
| tree | b2e6cabc0b43782498b4914fcabc8a4ab4838871 | |
| parent | cde6d02aaaa881f9067375e56205b637b6507bda (diff) | |
| download | binutils-redhat-c8704f69dffd3dd4200a00408b76009bcd3be62d.tar.gz | |
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>
| -rw-r--r-- | binutils/ChangeLog | 5 | ||||
| -rw-r--r-- | binutils/Makefile.am | 2 | ||||
| -rw-r--r-- | binutils/Makefile.in | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 43937986dd..e483ac8d42 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 bbe58e2132..59f759fcce 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 9f10781d58..9fe5642f94 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 |