diff options
author | nagachika <nagachika@ruby-lang.org> | 2022-10-15 16:32:46 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2022-10-15 16:32:46 +0900 |
commit | d4dadf5d9baf2998b95550cb5bd7f55a4f11a729 (patch) | |
tree | 5346c7ac4268227ce85103f9a4ed85c321353ad7 /tool | |
parent | 578f0313ed7e10d39242f2c7659dc24ae1953be6 (diff) |
merge revision(s) 8a3663789c52ec5635194656af6b69d3d03120ee:
Fix bundled gems installation when relative loading
---
tool/rbinstall.rb | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
Diffstat (limited to 'tool')
-rwxr-xr-x | tool/rbinstall.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 941e6a02ed..b7ecb9a47b 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -848,9 +848,6 @@ module RbInstall def write_cache_file end - def build_extensions - end if /mswin|mingw/ =~ RUBY_PLATFORM || RbConfig::CONFIG["CROSS_COMPILING"] == "yes" - def shebang(bin_file_name) path = File.join(gem_dir, spec.bindir, bin_file_name) first_line = File.open(path, "rb") {|file| file.gets} @@ -902,6 +899,13 @@ module RbInstall RbInstall.no_write(options) {super} end + if RbConfig::CONFIG["LIBRUBY_RELATIVE"] == "yes" || RbConfig::CONFIG["CROSS_COMPILING"] == "yes" + # TODO: always build extensions in bundled gems by build-ext and + # install the built binaries. + def build_extensions + end + end + def generate_bin_script(filename, bindir) name = formatted_program_filename(filename) unless $dryrun |