[前][次][番号順一覧][スレッド一覧]

ruby-changes:25418

From: shirosaki <ko1@a...>
Date: Mon, 5 Nov 2012 23:00:49 +0900 (JST)
Subject: [ruby-changes:25418] shirosaki:r37475 (trunk): * cygwin/GNUmakefile.in (uncommon.mk): link *.res.o.

shirosaki	2012-11-05 23:00:35 +0900 (Mon, 05 Nov 2012)

  New Revision: 37475

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37475

  Log:
    * 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]

  Modified files:
    trunk/ChangeLog
    trunk/cygwin/GNUmakefile.in

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37474)
+++ ChangeLog	(revision 37475)
@@ -1,3 +1,10 @@
+Mon Nov  5 22:09:26 2012  Hiroshi Shirosaki  <h.shirosaki@g...>
+
+	* 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@g...>
 
 	* thread_pthread.c (native_thread_init, native_thread_destroy):
Index: cygwin/GNUmakefile.in
===================================================================
--- cygwin/GNUmakefile.in	(revision 37474)
+++ cygwin/GNUmakefile.in	(revision 37475)
@@ -29,13 +29,14 @@
 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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]