diff options
| author | nagachika <nagachika@ruby-lang.org> | 2023-03-21 15:25:32 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2023-03-21 15:25:32 +0900 |
| commit | 485e0e46a58ff1a28eecd63b804b3dbea4b95b98 (patch) | |
| tree | 449ca81c84f1a8ba666fb9210656dd97b9fef1af /tool | |
| parent | 0d00732d39de1e5ecce738260a1e49d8af52e12a (diff) | |
merge revision(s) 3a7367ccc319499127ead147e5a08f769e44208e: [Backport #19403]
mkconfig: Map `includedir` only for system ruby
Only when installing to the system path on macOS, prepend '$(SDKROOT)'
and remap `includedir`.
Fix https://github.com/rbenv/ruby-build/discussions/2123
---
test/mkmf/test_config.rb | 4 ++--
test/test_rbconfig.rb | 9 ---------
tool/mkconfig.rb | 4 +++-
3 files changed, 5 insertions(+), 12 deletions(-)
Diffstat (limited to 'tool')
| -rwxr-xr-x | tool/mkconfig.rb | 4 |
1 files changed, 3 insertions, 1 deletions
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)" |