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

ruby-changes:27438

From: nobu <ko1@a...>
Date: Mon, 25 Feb 2013 15:59:19 +0900 (JST)
Subject: [ruby-changes:27438] nobu:r39490 (trunk): depend: fix for static library on mswin

nobu	2013-02-25 15:59:10 +0900 (Mon, 25 Feb 2013)

  New Revision: 39490

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

  Log:
    depend: fix for static library on mswin
    
    * enc/depend (ARFLAGS, RANLIB): these values can be nil.  [Bug #7950]

  Modified files:
    trunk/enc/depend

Index: enc/depend
===================================================================
--- enc/depend	(revision 39489)
+++ enc/depend	(revision 39490)
@@ -10,8 +10,8 @@ https://github.com/ruby/ruby/blob/trunk/enc/depend#L10
 % rule_subst = CONFIG["RULE_SUBST"] || "%s"
 % transvpath = rule_subst.dup.sub!(/\{[^{}]+\}/, '$(TRANSVPATH)/') || "enc/trans/%s"
 % transvpath_prefix = (rule_subst.dup.sub!(/\{[^{}]+\}/, '{$(TRANSVPATH)}') || "%s") % ""
-% CONFIG['ARFLAGS'] = 'rcu ' if CONFIG['ARFLAGS'].empty?
-% CONFIG['RANLIB'] = ':' if CONFIG['RANLIB'].empty?
+% CONFIG['ARFLAGS'] = 'rcu ' if (CONFIG['ARFLAGS'] || "").empty?
+% CONFIG['RANLIB'] = ':' if (CONFIG['RANLIB'] || "").empty?
 % if File::ALT_SEPARATOR
 %   pathrep = proc {|path| path.gsub('/', File::ALT_SEPARATOR).gsub(/\$\(([@<?*]\w?|\w+)\)/, "$(\\1:/=\\#{File::ALT_SEPARATOR})")}
 % else

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

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