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

ruby-changes:23644

From: nobu <ko1@a...>
Date: Fri, 18 May 2012 17:41:11 +0900 (JST)
Subject: [ruby-changes:23644] nobu:r35695 (trunk): ext/extmk.rb: link archives only

nobu	2012-05-18 17:41:02 +0900 (Fri, 18 May 2012)

  New Revision: 35695

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

  Log:
    ext/extmk.rb: link archives only
    
    * ext/extmk.rb (extmake): link archives only, skip script only
      extension libraries.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35694)
+++ ChangeLog	(revision 35695)
@@ -1,3 +1,8 @@
+Fri May 18 17:41:00 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/extmk.rb (extmake): link archives only, skip script only
+	  extension libraries.
+
 Fri May 18 17:25:33 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* cont.c: bump up fiber machine stack size when running on 64bit
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 35694)
+++ ext/extmk.rb	(revision 35695)
@@ -234,7 +234,7 @@
     unless $destdir.to_s.empty? or $mflags.defined?("DESTDIR")
       args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))]
     end
-    if $static and %r(\A-test-) !~ target and ok
+    if $static and ok and !$objs.empty? and !File.fnmatch?("-*", target)
       args += ["static"] unless $clean
       $extlist.push [$static, target, $target, $preload]
     end

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

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