summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2020-03-30 22:47:56 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2020-03-30 22:47:56 +0000
commitd4e1eb1dfde6585b134c113f7b7cf73d69aa5f2e (patch)
tree8ec92613504787e9937b87fa87fbf233225ae2c8 /tool
parent209f34515819ae4147bbd76e8b8efa9f6261cf1d (diff)
merge revision(s) 4adb2d655dcd54b28366b4d17e86b21e2b622cd1: [Backport #16738]
Make RbConfig::CONFIG values mutable [Bug #16738] As `RbConfig.expand` modifies the argument and involved `CONFIG` values, its values should be mutable. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-xtool/mkconfig.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
index d6c86b4803..52ec6a85d7 100755
--- a/tool/mkconfig.rb
+++ b/tool/mkconfig.rb
@@ -245,7 +245,7 @@ print <<EOS if $unicode_version
CONFIG["UNICODE_VERSION"] = #{$unicode_version.dump}
EOS
print <<EOS if /darwin/ =~ arch
- CONFIG["SDKROOT"] = ENV["SDKROOT"] || "" # don't run xcrun everytime, usually useless.
+ CONFIG["SDKROOT"] = "\#{ENV['SDKROOT']}" # don't run xcrun every time, usually useless.
EOS
print <<EOS
CONFIG["archdir"] = "$(rubyarchdir)"