diff options
| author | shirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-05 14:00:35 +0000 |
|---|---|---|
| committer | shirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-05 14:00:35 +0000 |
| commit | 868ab650eb54e723e4c91a7279b7bfbe424d23e4 (patch) | |
| tree | 05a1140a8fbeaeb9b2999a4dd9ac00690364d5db | |
| parent | 9da62b63d9377299db5240e007ccf4a1644e4233 (diff) | |
| download | ruby-868ab650eb54e723e4c91a7279b7bfbe424d23e4.tar.gz | |
* 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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -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) |