diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-28 07:25:15 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-28 07:25:15 +0000 |
| commit | 896039f94b869346832e8887e4e2919a37214280 (patch) | |
| tree | 4333a8daef83b6be3e8e10ada0546645b1a0b1d4 | |
| parent | 952ed33b13ef4343066c5a38ce22445c92d7f6c2 (diff) | |
| download | ruby-896039f94b869346832e8887e4e2919a37214280.tar.gz | |
GNUmakefile.in: append resources always
* cygwin/GNUmakefile.in (EXTOBJS): override to add resource files
always. [ruby-core:67153] [Bug #10657]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | cygwin/GNUmakefile.in | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Dec 28 16:25:12 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@ruby-lang.org> * parse.y (f_kwrest, new_args_tail_gen): unnamed rest keyword and diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 5bd414d786..768a1b6b7f 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -33,7 +33,7 @@ WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT) -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 |