diff options
| author | nagachika <nagachika@ruby-lang.org> | 2022-10-21 15:20:36 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2022-10-21 15:20:36 +0900 |
| commit | e8cb6dae740d5c5613854f8b280a7b0cf5a0fa17 (patch) | |
| tree | d2d6f86294354cc50a7ab11327b201e4442e2bc6 /template | |
| parent | bef621fcabd50fe46e76ed9904eb5d1cf6654ec1 (diff) | |
merge revision(s) 518301883edee12218657c77ba977e2bde1b17d0:
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(-)
Diffstat (limited to 'template')
| -rw-r--r-- | template/Makefile.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/template/Makefile.in b/template/Makefile.in index 2e86465832..86f8b1e969 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -160,6 +160,7 @@ yes_baseruby = $(HAVE_BASERUBY:no=) 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@) |