diff options
| author | nagachika <nagachika@ruby-lang.org> | 2022-10-19 22:20:49 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2022-10-19 22:20:49 +0900 |
| commit | 1db6249c66291ad2464f89768d24d850dbf98901 (patch) | |
| tree | c91b12bfcfec8420ce07eec605aa927ea20486a3 /win32 | |
| parent | 3e05dff67cfa734eff18f0edf826ab2876b210b4 (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 'win32')
| -rw-r--r-- | win32/Makefile.sub | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index a61c9c553c..18871528a7 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -378,13 +378,15 @@ RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)" -I. !endif MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT) RUNRUBY = $(RUNRUBY) "$(tooldir)/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) -- $(RUN_OPTS) +yes_baseruby = $(HAVE_BASERUBY:no=) +no_baseruby = $(HAVE_BASERUBY:yes=) !if "$(CROSS_COMPILING)" == "yes" XRUBY = $(MINIRUBY) BOOTSTRAPRUBY = $(BASERUBY) -BOOTSTRAPRUBY_COMMAND = $(BOOTSTRAPRUBY) -r./$(arch)-fake +BOOTSTRAPRUBY_OPT = -r./$(arch)-fake !else BOOTSTRAPRUBY = $(MINIRUBY) -BOOTSTRAPRUBY_COMMAND = $(BOOTSTRAPRUBY) +BOOTSTRAPRUBY_OPT = XRUBY = $(RUNRUBY) !endif BTESTRUBY = $(MINIRUBY) |