From fd669f71eaf711915ed89b65714969e20997b0a7 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 22 Aug 2023 11:32:43 -0600 Subject: Simplify definition of GUILE This patch sets GUILE to just plain 'guile'. In the distant ("devo") past, the top-level build did support building Guile in-tree. However, I don't think this really works any more. For one thing, there are no build dependencies on it, so there's no guarantee it would actually be built before the uses. This patch also removes the use of "-s" as an option to cgen scheme scripts. With my latest patch upstream, this is no longer needed. After the upstream changes, either Guile 2 or Guile 3 will work, with or without the compiler enabled. 2023-08-24 Tom Tromey * cgen.sh: Don't pass "-s" to cgen. * Makefile.in: Rebuild. * Makefile.am (GUILE): Simplify. --- sim/Makefile.in | 2 +- sim/common/cgen.sh | 4 ---- sim/common/local.mk | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) (limited to 'sim') diff --git a/sim/Makefile.in b/sim/Makefile.in index 3da1b25..3dd1454 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -1871,7 +1871,7 @@ SIM_COMMON_LIBS = \ $(LIBGNU) \ $(LIBGNU_EXTRA_LIBS) -GUILE = $(or $(wildcard ../guile/libguile/guile),guile) +GUILE = guile CGEN = "$(GUILE) -l $(cgendir)/guile.scm -s" CGENFLAGS = -v CGEN_CPU_DIR = $(cgendir)/cpu diff --git a/sim/common/cgen.sh b/sim/common/cgen.sh index 394ef2d..a7479ec 100755 --- a/sim/common/cgen.sh +++ b/sim/common/cgen.sh @@ -60,7 +60,6 @@ arch) rm -f ${tmp}-all.h1 ${tmp}-all.h ${cgen} ${cgendir}/cgen-sim.scm \ - -s ${cgendir} \ ${cgenflags} \ -f "${archflags}" \ -m ${mach} \ @@ -125,7 +124,6 @@ cpu | decode | cpu-decode) esac ${cgen} ${cgendir}/cgen-sim.scm \ - -s ${cgendir} \ ${cgenflags} \ -f "${archflags}" \ -m ${mach} \ @@ -187,7 +185,6 @@ defs) rm -f ${tmp}-defs.h1 ${tmp}-defs.h ${cgen} ${cgendir}/cgen-sim.scm \ - -s ${cgendir} \ ${cgenflags} \ -f "${archflags}" \ -m ${mach} \ @@ -205,7 +202,6 @@ desc) rm -f ${tmp}-opc.h1 ${tmp}-opc.h ${cgen} ${cgendir}/cgen-opc.scm \ - -s ${cgendir} \ ${cgenflags} \ -OPC ${opcfile} \ -f "${archflags}" \ diff --git a/sim/common/local.mk b/sim/common/local.mk index 5d0992f..08da227 100644 --- a/sim/common/local.mk +++ b/sim/common/local.mk @@ -178,7 +178,7 @@ SIM_COMMON_LIBS = \ ## ## If the local tree has a bundled copy of guile, use that. -GUILE = $(or $(wildcard ../guile/libguile/guile),guile) +GUILE = guile CGEN = "$(GUILE) -l $(cgendir)/guile.scm -s" CGENFLAGS = -v CGEN_CPU_DIR = $(cgendir)/cpu -- cgit v1.1