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

ruby-changes:21648

From: nobu <ko1@a...>
Date: Thu, 10 Nov 2011 15:13:47 +0900 (JST)
Subject: [ruby-changes:21648] nobu:r33697 (trunk): * lib/mkmf.rb (try_func): ignore empty opts.

nobu	2011-11-10 15:13:37 +0900 (Thu, 10 Nov 2011)

  New Revision: 33697

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

  Log:
    * lib/mkmf.rb (try_func): ignore empty opts.

  Modified files:
    trunk/lib/mkmf.rb

Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 33696)
+++ lib/mkmf.rb	(revision 33697)
@@ -625,14 +625,17 @@
 	break opt = opt.send(meth, *args)
       end
     end
+    opt = "#{opt} #{libs}"
+  else
+    opt = libs
   end
-  try_link(<<"SRC", "#{opt} #{libs}", &b) or
+  try_link(<<"SRC", opt, &b) or
 #{headers}
 /*top*/
 #{MAIN_DOES_NOTHING}
 int t() { #{decltype["volatile p"]}; p = (#{decltype[]})#{func}; return 0; }
 SRC
-  call && try_link(<<"SRC", "#{opt} #{libs}", &b)
+  call && try_link(<<"SRC", opt, &b)
 #{headers}
 /*top*/
 #{MAIN_DOES_NOTHING}

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

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