зеркало из https://github.com/github/ruby.git
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
This commit is contained in:
Родитель
952ed33b13
Коммит
896039f94b
|
@ -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>
|
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
|
* parse.y (f_kwrest, new_args_tail_gen): unnamed rest keyword and
|
||||||
|
|
|
@ -33,7 +33,7 @@ WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
|
||||||
-include uncommon.mk
|
-include uncommon.mk
|
||||||
|
|
||||||
SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
|
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
|
RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc
|
||||||
RUBYDEF = $(DLL_BASE_NAME).def
|
RUBYDEF = $(DLL_BASE_NAME).def
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче