mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
6f2a41e995
commit
e98f7ea423
1 changed files with 5 additions and 0 deletions
|
@ -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 <<EOS if /darwin/ =~ arch
|
||||
CONFIG["SDKROOT"] = ENV["SDKROOT"] || "" # don't run xcrun everytime, usually useless.
|
||||
EOS
|
||||
print <<EOS
|
||||
CONFIG["archdir"] = "$(rubyarchdir)"
|
||||
CONFIG["topdir"] = File.dirname(__FILE__)
|
||||
|
|
Loading…
Reference in a new issue