diff options
author | nagachika <nagachika@ruby-lang.org> | 2022-10-18 21:42:37 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2022-10-18 21:42:37 +0900 |
commit | 8e74bfb641096f39f8eb22961f7aadf89ab741cf (patch) | |
tree | ff7549299235e270121b370345afd8c09bf98c0d /cygwin | |
parent | 0bdf9c4e01345867159aa042b2540be710f8ec5e (diff) |
merge revision(s) 7c67d0fd79a3cffe857587fa3cf576b611023840:
Make sources by BASERUBY if available instead of miniruby
---
common.mk | 25 +++++++++++++++----------
configure.ac | 6 +++++-
cygwin/GNUmakefile.in | 4 ++--
template/Makefile.in | 2 +-
win32/Makefile.sub | 10 ++++++++--
5 files changed, 31 insertions(+), 16 deletions(-)
Diffstat (limited to 'cygwin')
-rw-r--r-- | cygwin/GNUmakefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index b13c3d9c8a..125b2bf7fc 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -55,7 +55,7 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@ %.rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb $(ECHO) generating $@ - $(Q) $(MINIRUBY) $(srcdir)/win32/resource.rb \ + $(Q) $(BOOTSTRAPRUBY_COMMAND) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \ -so_name=$(DLL_BASE_NAME) -output=$(*F) \ . $(icondirs) $(srcdir)/win32 @@ -96,7 +96,7 @@ $(LIBRUBY_SO): $(RUBYDEF) $(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG) $(ECHO) generating $@ - $(Q) $(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A) + $(Q) $(BOOTSTRAPRUBY_COMMAND) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A) clean-local:: @$(RM) $(RUBYDEF) |