diff options
| author | Hiroshi SHIBATA <[email protected]> | 2025-01-08 11:02:00 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2025-01-08 11:55:39 +0900 |
| commit | 4a02a72ca57daf4984a3b2245dbc418fe35e6295 (patch) | |
| tree | d839fcd66942b6b894dafdf57dd5f16c9bc68c36 /lib | |
| parent | aaf36f4f8eb585ef598aa9f2d973adf92a868de3 (diff) | |
Dont't use stub constants like LIBDIR in bundled_gems.rb
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/12529
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundled_gems.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/bundled_gems.rb b/lib/bundled_gems.rb index e09402b1a6..ff13a0873d 100644 --- a/lib/bundled_gems.rb +++ b/lib/bundled_gems.rb @@ -51,14 +51,8 @@ module Gem::BUNDLED_GEMS # :nodoc: WARNED = {} # unfrozen conf = ::RbConfig::CONFIG - if ENV["TEST_BUNDLED_GEMS_FAKE_RBCONFIG"] - LIBDIR = (File.expand_path(File.join(__dir__, "..", "lib")) + "/").freeze - rubyarchdir = $LOAD_PATH.find{|path| path.include?(".ext/common") } - ARCHDIR = (File.expand_path(rubyarchdir) + "/").freeze - else - LIBDIR = (conf["rubylibdir"] + "/").freeze - ARCHDIR = (conf["rubyarchdir"] + "/").freeze - end + LIBDIR = (conf["rubylibdir"] + "/").freeze + ARCHDIR = (conf["rubyarchdir"] + "/").freeze dlext = [conf["DLEXT"], "so"].uniq DLEXT = /\.#{Regexp.union(dlext)}\z/ LIBEXT = /\.#{Regexp.union("rb", *dlext)}\z/ @@ -229,8 +223,6 @@ module Gem::BUNDLED_GEMS # :nodoc: msg end - - freeze end # for RubyGems without Bundler environment. |