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

ruby-changes:41328

From: nobu <ko1@a...>
Date: Fri, 1 Jan 2016 10:27:38 +0900 (JST)
Subject: [ruby-changes:41328] nobu:r53400 (trunk): mkconfig.rb: SDKROOT

nobu	2016-01-01 10:27:30 +0900 (Fri, 01 Jan 2016)

  New Revision: 53400

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

  Log:
    mkconfig.rb: SDKROOT
    
    * tool/mkconfig.rb (RbConfig): prefix SDKROOT to oldincludedir
      not includedir, the latter is outside the ruby installation.
      [ruby-core:72496] [Bug #11881]

  Modified files:
    trunk/ChangeLog
    trunk/tool/mkconfig.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 53399)
+++ ChangeLog	(revision 53400)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Jan  1 10:27:28 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* tool/mkconfig.rb (RbConfig): prefix SDKROOT to oldincludedir
+	  not includedir, the latter is outside the ruby installation.
+	  [ruby-core:72496] [Bug #11881]
+
 Fri Jan  1 08:53:02 2016  Yuki Kurihara  <co000ri@g...>
 
 	* test/ruby/test_lazy_enumerator.rb (test_take_bad_arg): Add test
Index: tool/mkconfig.rb
===================================================================
--- tool/mkconfig.rb	(revision 53399)
+++ tool/mkconfig.rb	(revision 53400)
@@ -131,7 +131,7 @@ File.foreach "config.status" do |line| https://github.com/ruby/ruby/blob/trunk/tool/mkconfig.rb#L131
       if universal
         val.sub!(/universal/, %q[#{arch && universal[/(?:\A|\s)#{Regexp.quote(arch)}=(\S+)/, 1] || '\&'}])
       end
-    when /^includedir$/
+    when /^oldincludedir$/
       val = '"$(SDKROOT)"'+val if /darwin/ =~ arch
     end
     v = "  CONFIG[\"#{name}\"] #{eq} #{val}\n"

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

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