diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-31 23:38:01 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-31 23:38:01 +0000 |
| commit | 017eb0f12c4f631d673aca5447511344b093c102 (patch) | |
| tree | 3a7cacfeaf2e645f05e0e81c7e99c62508cbde34 /cygwin | |
| parent | c7cb212820f05695259fd0986a288c4f0ea57a55 (diff) | |
merge revision(s) 49042: [Backport #10657]
* 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/branches/ruby_2_2@49087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cygwin')
| -rw-r--r-- | cygwin/GNUmakefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
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 |