kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

mkconfig.rb: Update around SDKROOT

Browse source 
c.f. https://opensource.apple.com/source/ruby/ruby-145.40.1/patches/tool_mkconfig.rb.diff

* moved to "includedir" from "oldincludedir".
* honor "$(prefix)/include" if exists, otherwise fallback to `xcrun`.
This commit is contained in:
Nobuyoshi Nakada 2021-04-15 12:49:06 +09:00
parent df0f60b690
commit fd978621cc
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tool/mkconfig.rb
View file

@ -124,7 +124,7 @@ File.foreach "config.status" do |line|
if universal if universal
platform = val.sub(/universal/, %q[#{arch && universal[/(?:\A|\s)#{Regexp.quote(arch)}=(\S+)/, 1] || RUBY_PLATFORM[/\A[^-]*/]}]) platform = val.sub(/universal/, %q[#{arch && universal[/(?:\A|\s)#{Regexp.quote(arch)}=(\S+)/, 1] || RUBY_PLATFORM[/\A[^-]*/]}])
end end
when /^oldincludedir$/ when /^includedir$/
val = '"$(SDKROOT)"'+val if /darwin/ =~ arch val = '"$(SDKROOT)"'+val if /darwin/ =~ arch
end end
v = " CONFIG[\"#{name}\"] #{eq} #{val}\n" v = " CONFIG[\"#{name}\"] #{eq} #{val}\n"
@ -269,7 +269,15 @@ print <<EOS if $unicode_emoji_version
CONFIG["UNICODE_EMOJI_VERSION"] = #{$unicode_emoji_version.dump} CONFIG["UNICODE_EMOJI_VERSION"] = #{$unicode_emoji_version.dump}
EOS EOS
print <<EOS if /darwin/ =~ arch print <<EOS if /darwin/ =~ arch
CONFIG["SDKROOT"] = "\#{ENV['SDKROOT']}" # don't run xcrun every time, usually useless. if sdkroot = ENV["SDKROOT"]
sdkroot = sdkroot.dup
elsif File.exist?(File.join(CONFIG["prefix"], "include")) ||
!(sdkroot = (IO.popen(%w[/usr/bin/xcrun --sdk macosx --show-sdk-path], in: IO::NULL, err: IO::NULL, &:read) rescue nil))
sdkroot = +""
else
sdkroot.chomp!
end
CONFIG["SDKROOT"] = sdkroot
EOS EOS
print <<EOS print <<EOS
CONFIG["platform"] = #{platform || '"$(arch)"'} CONFIG["platform"] = #{platform || '"$(arch)"'}