Skip to content

Commit 5183018

Browse files
larskanisnobu
authored andcommitted
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 ```
1 parent 5b5c627 commit 5183018

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

cygwin/GNUmakefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.$(OBJEXT)
5252
$(ECHO) compiling $@
5353
$(Q) $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
5454

55-
%.rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
55+
%.rc: $(BOOTSTRAPRUBY_FAKE) $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
5656
$(ECHO) generating $@
5757
$(Q) $(BOOTSTRAPRUBY_COMMAND) $(srcdir)/win32/resource.rb \
5858
-ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
@@ -94,7 +94,7 @@ endif
9494

9595
$(LIBRUBY_SO): $(RUBYDEF)
9696

97-
$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG)
97+
$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(BOOTSTRAPRUBY_FAKE) $(RBCONFIG)
9898
$(ECHO) generating $@
9999
$(Q) $(BOOTSTRAPRUBY_COMMAND) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
100100

template/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ yes_baseruby = $(HAVE_BASERUBY:no=)
170170
no_baseruby = $(HAVE_BASERUBY:yes=)
171171
BOOTSTRAPRUBY = $(yes_baseruby:yes=$(BASERUBY)) $(no_baseruby:no=$(MINIRUBY))
172172
BOOTSTRAPRUBY_OPT = $(yes_baseruby:yes=-r./$(arch)-fake)
173+
BOOTSTRAPRUBY_FAKE = $(yes_baseruby:yes=$(arch)-fake.rb)
173174

174175
COROUTINE_H = @X_COROUTINE_H@
175176
COROUTINE_OBJ = $(COROUTINE_H:.h=.$(OBJEXT))

0 commit comments

Comments
 (0)