From 2fe36d31f96519ea5ef988d85df1310bc177b5fa Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 28 Jun 2021 21:26:48 -0400 Subject: 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. --- sim/common/ChangeLog | 5 +++++ sim/common/Make-common.in | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'sim/common') diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 5b167eb..37d4dc9 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,8 @@ +2021-07-01 Mike Frysinger + + * Make-common.in (GUILE): New variable. + (CGEN): Use $(GUILE). + 2021-06-30 Mike Frysinger * Make-common.in (SIM_SCACHE): Delete. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index e7c1cce..a02f529 100644 --- 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 -- cgit v1.1