summaryrefslogtreecommitdiff
path: root/template
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2022-10-19 22:20:49 +0900
committernagachika <nagachika@ruby-lang.org>2022-10-19 22:20:49 +0900
commit1db6249c66291ad2464f89768d24d850dbf98901 (patch)
treec91b12bfcfec8420ce07eec605aa927ea20486a3 /template
parent3e05dff67cfa734eff18f0edf826ab2876b210b4 (diff)
merge revision(s) 1f91dcdab3b530dde93fa29fba8bf60683cd8056:
Define BOOTSTRAPRUBY from HAVE_BASERUBY --- common.mk | 1 + configure.ac | 8 -------- template/Makefile.in | 7 +++++-- win32/Makefile.sub | 6 ++++-- 4 files changed, 10 insertions(+), 12 deletions(-)
Diffstat (limited to 'template')
-rw-r--r--template/Makefile.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/template/Makefile.in b/template/Makefile.in
index f6fa5d9a6c..1c664a095b 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -156,8 +156,11 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
XRUBY_LIBDIR = @XRUBY_LIBDIR@
XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@
XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@
-BOOTSTRAPRUBY = @BOOTSTRAPRUBY@
-BOOTSTRAPRUBY_COMMAND = @BOOTSTRAPRUBY_COMMAND@
+
+yes_baseruby = $(HAVE_BASERUBY:no=)
+no_baseruby = $(HAVE_BASERUBY:yes=)
+BOOTSTRAPRUBY = $(yes_baseruby:yes=$(BASERUBY)) $(no_baseruby:$(MINIRUBY))
+BOOTSTRAPRUBY_OPT = $(yes_baseruby:yes=-r./$(arch)-fake)
COROUTINE_H = @X_COROUTINE_H@
COROUTINE_OBJ = $(COROUTINE_H:.h=.@OBJEXT@)