diff options
| -rw-r--r-- | test/mkmf/test_config.rb | 4 | ||||
| -rw-r--r-- | test/test_rbconfig.rb | 9 | ||||
| -rwxr-xr-x | tool/mkconfig.rb | 4 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 6 insertions, 13 deletions
diff --git a/test/mkmf/test_config.rb b/test/mkmf/test_config.rb index 3878db1964..93ebe3a4ea 100644 --- a/test/mkmf/test_config.rb +++ b/test/mkmf/test_config.rb @@ -7,9 +7,9 @@ require 'mkmf' class TestMkmfConfig < Test::Unit::TestCase def test_dir_config bug8074 = '[Bug #8074]' - lib = RbConfig.expand(RbConfig::MAKEFILE_CONFIG["libdir"], "exec_prefix"=>"") + lib = RbConfig.expand(RbConfig::MAKEFILE_CONFIG["libdir"], "exec_prefix"=>"/test/foo") assert_separately %w[-rmkmf - -- --with-foo-dir=/test/foo], %{ - assert_equal(%w[/test/foo/include /test/foo#{lib}], dir_config("foo"), #{bug8074.dump}) + assert_equal(%w[/test/foo/include #{lib}], dir_config("foo"), #{bug8074.dump}) } end end diff --git a/test/test_rbconfig.rb b/test/test_rbconfig.rb index fcbbbd8500..1bbf01b9a6 100644 --- a/test/test_rbconfig.rb +++ b/test/test_rbconfig.rb @@ -51,13 +51,4 @@ 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 6e23af5185..41bee02247 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -268,7 +268,7 @@ EOS print <<EOS if $unicode_emoji_version CONFIG["UNICODE_EMOJI_VERSION"] = #{$unicode_emoji_version.dump} EOS -print <<EOS if /darwin/ =~ arch +print prefix.start_with?("/System/") ? <<EOS : <<EOS if /darwin/ =~ arch if sdkroot = ENV["SDKROOT"] sdkroot = sdkroot.dup elsif File.exist?(File.join(CONFIG["prefix"], "include")) || @@ -279,6 +279,8 @@ print <<EOS if /darwin/ =~ arch end CONFIG["SDKROOT"] = sdkroot EOS + CONFIG["SDKROOT"] = "" +EOS print <<EOS CONFIG["platform"] = #{platform || '"$(arch)"'} CONFIG["archdir"] = "$(rubyarchdir)" @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 4 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 203 +#define RUBY_PATCHLEVEL 204 #define RUBY_RELEASE_YEAR 2023 #define RUBY_RELEASE_MONTH 3 |