diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-09 02:46:31 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-09 02:46:31 +0000 |
| commit | a4c091a69723f57865e619ba031e3afdfc2b0d14 (patch) | |
| tree | 1956610399a1636a150d992989a27cd586b83183 | |
| parent | c0e36de0aa0c632f630cd059ebb1bfdca927b44d (diff) | |
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
| -rw-r--r-- | cygwin/GNUmakefile.in | 4 | ||||
| -rwxr-xr-x | win32/resource.rb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index d5502382fb..d02b476c6d 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -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@ diff --git a/win32/resource.rb b/win32/resource.rb index 64682335bf..e19e04b922 100755 --- a/win32/resource.rb +++ b/win32/resource.rb @@ -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 |