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

ruby-changes:23669

From: nobu <ko1@a...>
Date: Sat, 19 May 2012 19:04:49 +0900 (JST)
Subject: [ruby-changes:23669] nobu:r35720 (trunk): static-linked-ext: all linked ruby

nobu	2012-05-19 19:04:40 +0900 (Sat, 19 May 2012)

  New Revision: 35720

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

  Log:
    static-linked-ext: all linked ruby
    
    * ext/extmk.rb (command_output): ENCOBJS is needed for all linked
      ruby, if --disable-shared and --with-static-linked-ext.

  Modified files:
    trunk/ChangeLog
    trunk/ext/extmk.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35719)
+++ ChangeLog	(revision 35720)
@@ -1,5 +1,8 @@
-Sat May 19 14:57:31 2012  Nobuyoshi Nakada  <nobu@r...>
+Sat May 19 19:04:38 2012  Nobuyoshi Nakada  <nobu@r...>
 
+	* ext/extmk.rb (command_output): ENCOBJS is needed for all linked
+	  ruby, if --disable-shared and --with-static-linked-ext.
+
 	* ext/extmk.rb (command_output): dmyext is needed as DLDOBJS if no
 	  static lined extensions.
 
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 35719)
+++ ext/extmk.rb	(revision 35720)
@@ -666,7 +666,7 @@
         mf.print %[DLDOBJS="$(EXTOBJS)" SOLIBS="$(ENCOBJS) $(EXTLIBS)" ]
         mf.print 'LIBRUBY_SO_UPDATE=$(LIBRUBY_EXTS) '
       else
-        mf.print %[EXTOBJS="$(EXTOBJS)" EXTLIBS="$(EXTLIBS)" ]
+        mf.print %[EXTOBJS="$(EXTOBJS) $(ENCOBJS)" EXTLIBS="$(EXTLIBS)" ]
       end
       mf.puts 'EXTLDFLAGS="$(EXTLDFLAGS)" $@'
     end

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

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