nobu	2014-12-28 16:25:15 +0900 (Sun, 28 Dec 2014)

  New Revision: 49042

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49042

  Log:
    GNUmakefile.in: append resources always
    
    * cygwin/GNUmakefile.in (EXTOBJS): override to add resource files
      always.  [ruby-core:67153] [Bug #10657]

  Modified files:
    trunk/ChangeLog
    trunk/cygwin/GNUmakefile.in
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49041)
+++ ChangeLog	(revision 49042)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Dec 28 16:25:12 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* cygwin/GNUmakefile.in (EXTOBJS): override to add resource files
+	  always.  [ruby-core:67153] [Bug #10657]
+
 Sun Dec 28 13:54:26 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (f_kwrest, new_args_tail_gen): unnamed rest keyword and
Index: cygwin/GNUmakefile.in
===================================================================
--- cygwin/GNUmakefile.in	(revision 49041)
+++ cygwin/GNUmakefile.in	(revision 49042)
@@ -33,7 +33,7 @@ WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT https://github.com/ruby/ruby/blob/trunk/cygwin/GNUmakefile.in#L33
 -include uncommon.mk
 
 SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
-EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)
+override EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)
 RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc
 RUBYDEF = $(DLL_BASE_NAME).def
 

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