diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | cygwin/GNUmakefile.in | 5 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Mon Nov 5 22:09:26 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com> + + * cygwin/GNUmakefile.in (uncommon.mk): link *.res.o. + EXTOBJES is defined in uncommon.mk. *.res.o setting should be below + uncommon.mk. + [ruby-core:48858] [Bug #7277] + Mon Nov 5 11:35:11 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * thread_pthread.c (native_thread_init, native_thread_destroy): diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 2b0a806c2c..5bd414d786 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -29,13 +29,14 @@ else endif 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) RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc RUBYDEF = $(DLL_BASE_NAME).def --include uncommon.mk - ruby: $(PROGRAM) rubyw: $(WPROGRAM) stub: $(STUBPROGRAM) |