https://git.ruby-lang.org/ruby.git/commit/?id=518301883e

From 518301883edee12218657c77ba977e2bde1b17d0 Mon Sep 17 00:00:00 2001
From: Lars Kanis <lars@g...>
Date: Fri, 9 Sep 2022 19:32:20 +0200
Subject: Fix parallel build on MINGW

When the build is running with a base ruby then generating `x64-ucrt-ruby320.rc`
could fail due to a missing dependency to `x64-mingw-ucrt-fake.rb`.
This commit adds this dependency.

A failing build looks like so:
```
generating x64-mingw-ucrt-fake.rb
generating x64-ucrt-ruby320.rc
../snapshot-master/win32/resource.rb:in `require': cannot load such file -- ./x64-mingw-ucrt-fake (LoadError)
make: *** [GNUmakefile:57: x64-ucrt-ruby320.rc] Error 1
make: *** Waiting for unfinished jobs....
linking miniruby.exe
x64-mingw-ucrt-fake.rb updated
```
---
 cygwin/GNUmakefile.in | 4 ++--
 template/Makefile.in  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 3b11d3f69c..43e92a27f0 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -52,7 +52,7 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.$(OBJEXT) https://github.com/ruby/ruby/blob/trunk/cygwin/GNUmakefile.in#L52
 	$(ECHO) compiling $@
 	$(Q) $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
-%.rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
+%.rc: $(BOOTSTRAPRUBY_FAKE) $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 	$(ECHO) generating $@
 	$(Q) $(BOOTSTRAPRUBY_COMMAND) $(srcdir)/win32/resource.rb \
 	  -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
@@ -94,7 +94,7 @@ endif https://github.com/ruby/ruby/blob/trunk/cygwin/GNUmakefile.in#L94
 
 $(LIBRUBY_SO): $(RUBYDEF)
 
-$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG)
+$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(BOOTSTRAPRUBY_FAKE) $(RBCONFIG)
 	$(ECHO) generating $@
 	$(Q) $(BOOTSTRAPRUBY_COMMAND) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
 
diff --git a/template/Makefile.in b/template/Makefile.in
index 966170aa76..a644a92754 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -170,6 +170,7 @@ yes_baseruby = $(HAVE_BASERUBY:no=) https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L170
 no_baseruby = $(HAVE_BASERUBY:yes=)
 BOOTSTRAPRUBY = $(yes_baseruby:yes=$(BASERUBY)) $(no_baseruby:no=$(MINIRUBY))
 BOOTSTRAPRUBY_OPT = $(yes_baseruby:yes=-r./$(arch)-fake)
+BOOTSTRAPRUBY_FAKE = $(yes_baseruby:yes=$(arch)-fake.rb)
 
 COROUTINE_H = @X_COROUTINE_H@
 COROUTINE_OBJ = $(COROUTINE_H:.h=.$(OBJEXT))
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/