Permalink
Browse files

* 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
  • Loading branch information...
1 parent 9da62b6 commit 868ab650eb54e723e4c91a7279b7bfbe424d23e4 @shirosaki shirosaki committed Nov 5, 2012
Showing with 10 additions and 2 deletions.
  1. +7 −0 ChangeLog
  2. +3 −2 cygwin/GNUmakefile.in
View
@@ -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):
@@ -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)

0 comments on commit 868ab65

Please sign in to comment.