diff options
| -rw-r--r-- | test/test_rbconfig.rb | 9 | ||||
| -rwxr-xr-x | tool/mkconfig.rb | 2 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/test/test_rbconfig.rb b/test/test_rbconfig.rb index 1bbf01b9a6..fcbbbd8500 100644 --- a/test/test_rbconfig.rb +++ b/test/test_rbconfig.rb @@ -51,4 +51,13 @@ class TestRbConfig < Test::Unit::TestCase assert_match(/\$\(sitearch|\$\(rubysitearchprefix\)/, val, "#{key} #{bug7823}") end end + + if /darwin/ =~ RUBY_PLATFORM + def test_sdkroot + assert_separately([{"SDKROOT" => "$(prefix)/SDKRoot"}], "#{<<~"begin;"}\n#{<<~'end;'}") + begin; + assert_equal RbConfig::CONFIG["prefix"]+"/SDKRoot", RbConfig::CONFIG["SDKROOT"] + end; + end + end end diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index 6ed1dd8adc..980bea6e2c 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -251,7 +251,7 @@ print <<EOS if $unicode_emoji_version CONFIG["UNICODE_EMOJI_VERSION"] = #{$unicode_emoji_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)" @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.6" #define RUBY_RELEASE_DATE "2020-03-30" -#define RUBY_PATCHLEVEL 144 +#define RUBY_PATCHLEVEL 145 #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 3 |