From e98f7ea423b08222b6eceda945613040c7b08a09 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 10 Feb 2015 08:30:16 +0000 Subject: [PATCH] mkconfig.rb: SDKROOT * tool/mkconfig.rb (RbConfig): allow prefix includedir by SDKROOT environment variable on OSX. cf. http://www.opensource.apple.com/source/ruby/ruby-106/patches/tool_mkconfig.rb.diff git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/mkconfig.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index 3da57581ee..e874b3f407 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -132,6 +132,8 @@ File.foreach "config.status" do |line| if universal val.sub!(/universal/, %q[#{arch && universal[/(?:\A|\s)#{Regexp.quote(arch)}=(\S+)/, 1] || '\&'}]) end + when /^includedir$/ + val = '"$(SDKROOT)"'+val if /darwin/ =~ arch end v = " CONFIG[\"#{name}\"] #{eq} #{val}\n" if fast[name] @@ -232,6 +234,9 @@ end print(*v_fast) print(*v_others) +print <