mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
fix rc files conflict in parallel build
* cygwin/GNUmakefile.in (%.rc): generate .rc files separately to get rid of conflict in parallel build. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53480 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
c0e36de0aa
commit
a4c091a697
2 changed files with 3 additions and 2 deletions
|
@ -54,11 +54,11 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
|
|||
$(ECHO) compiling $@
|
||||
$(Q) $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
|
||||
|
||||
$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
|
||||
%.rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
|
||||
$(ECHO) generating $@
|
||||
$(Q) $(MINIRUBY) $(srcdir)/win32/resource.rb \
|
||||
-ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
|
||||
-so_name=$(DLL_BASE_NAME) \
|
||||
-so_name=$(DLL_BASE_NAME) -output=$(*F) \
|
||||
. $(icondirs) $(srcdir)/win32
|
||||
|
||||
$(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
|
||||
|
|
|
@ -52,6 +52,7 @@ end
|
|||
[$rubyw_name, CONFIG["EXEEXT"], 'VFT_APP', 'GUI', rubyw_icon || ruby_icon],
|
||||
[$so_name, '.dll', 'VFT_DLL', 'DLL', dll_icons.join],
|
||||
].each do |base, ext, type, desc, icon|
|
||||
next if $output and $output != base
|
||||
open(base + '.rc', "w") { |f|
|
||||
f.binmode if /mingw/ =~ RUBY_PLATFORM
|
||||
|
||||
|
|
Loading…
Reference in a new issue