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.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 1205dbfa95f5402669b6f7be983e92c1bdb249c5..b3d73dcd4aebc6dc44787008ce49985c3df2f6c6 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index ddae8bd9052f51d83aa907f68ed8551413c0d520..0e04b4c05c4a804a8d302d5136100f4f8f1d92ba 100644 (file)
--- 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 23a52bcd69ac11bf8050fc8b5819121264f5c86c..42c15f00d30ed3437c19bfb518e057acbb48b9cd 100644 (file)
--- 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 \

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 5b167eb89ae30f3dc8cb0b49e0141ae1ef7735eb..37d4dc99e92c2239b108baa29892d2036957fbc5 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2021-07-01  Mike Frysinger  <vapier@gentoo.org>
+
+       * Make-common.in (GUILE): New variable.
+       (CGEN): Use $(GUILE).
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
        * Make-common.in (SIM_SCACHE): Delete.

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index e7c1cce46f41bd5d3348578a511f1a3d994573fe..a02f529b385092f5ab453e486a1c5d3db0866ca3 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -542,7 +542,8 @@ Makefile: Makefile.in $(srccom)/Make-common.in $(config.status)
 
 # CGEN support
 
-CGEN = "`if [ -f ../../guile/libguile/guile ]; then echo ../../guile/libguile/guile; else echo guile ; fi` -l $(CGENDIR)/guile.scm -s"
+GUILE = `if [ -f ../../guile/libguile/guile ]; then echo ../../guile/libguile/guile; else echo guile ; fi`
+CGEN = "$(GUILE) -l $(CGENDIR)/guile.scm -s"
 CGENFLAGS = -v
 CGEN_CPU_DIR = $(CGENDIR)/cpu