diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-06-28 21:26:48 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-07-01 18:05:40 -0400 |
| commit | 2fe36d31f96519ea5ef988d85df1310bc177b5fa (patch) | |
| tree | d75694894bf0749d04acee940a8168cc7b85884d /opcodes | |
| parent | f375d32b35cef9813410107430963d51600d6896 (diff) | |
| download | binutils-gdb-2fe36d31f96519ea5ef988d85df1310bc177b5fa.tar.gz | |
cgen: split GUILE setting out
This makes it easier to override to point to an older version of guile.
The current cgen code doesn't work with guile-2, so need to point to an
older guile-1.8.
Diffstat (limited to 'opcodes')
| -rw-r--r-- | opcodes/ChangeLog | 6 | ||||
| -rw-r--r-- | opcodes/Makefile.am | 3 | ||||
| -rw-r--r-- | opcodes/Makefile.in | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 1205dbfa95f..b3d73dcd4ae 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,5 +1,11 @@ 2021-07-01 Mike Frysinger <vapier@gentoo.org> + * Makefile.am (GUILE): New variable. + (CGEN): Use $(GUILE). + * Makefile.in: Regenerate. + +2021-07-01 Mike Frysinger <vapier@gentoo.org> + * mep-asm.c (macros): Mark static & const. (lookup_macro): Change return & m to const. (expand_macro): Change mac to const. diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index ddae8bd9052..0e04b4c05c4 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -363,7 +363,8 @@ CLEANFILES = \ CGENDIR = @cgendir@ CPUDIR = $(srcdir)/../cpu -CGEN = "`if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` -l ${cgendir}/guile.scm -s" +GUILE = `if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` +CGEN = "$(GUILE) -l ${cgendir}/guile.scm -s" CGENFLAGS = -v CGENDEPS = \ diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index 23a52bcd69a..42c15f00d30 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -722,7 +722,8 @@ CLEANFILES = \ CGENDIR = @cgendir@ CPUDIR = $(srcdir)/../cpu -CGEN = "`if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` -l ${cgendir}/guile.scm -s" +GUILE = `if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` +CGEN = "$(GUILE) -l ${cgendir}/guile.scm -s" CGENFLAGS = -v CGENDEPS = \ $(CGENDIR)/desc.scm $(CGENDIR)/desc-cpu.scm \ |