diff options
| author | Hiroshi SHIBATA <[email protected]> | 2021-07-07 14:07:29 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2021-07-07 15:31:52 +0900 |
| commit | c082c6eb7c786a432bea23cf78839f64585cb630 (patch) | |
| tree | e3c608264fe03645e905fe7284d713cff87b87dd /lib/bundler/current_ruby.rb | |
| parent | 6e2240a2f954c84ed12357382c9c065ae4b91e11 (diff) | |
Sync RubyGems and Bundler with upstream
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4634
Diffstat (limited to 'lib/bundler/current_ruby.rb')
| -rw-r--r-- | lib/bundler/current_ruby.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/bundler/current_ruby.rb b/lib/bundler/current_ruby.rb index b8c7cada1c..f84d68e262 100644 --- a/lib/bundler/current_ruby.rb +++ b/lib/bundler/current_ruby.rb @@ -65,19 +65,19 @@ module Bundler end def mswin? - Bundler::WINDOWS + Gem.win_platform? end def mswin64? - Bundler::WINDOWS && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mswin64" && Bundler.local_platform.cpu == "x64" + Gem.win_platform? && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mswin64" && Bundler.local_platform.cpu == "x64" end def mingw? - Bundler::WINDOWS && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mingw32" && Bundler.local_platform.cpu != "x64" + Gem.win_platform? && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mingw32" && Bundler.local_platform.cpu != "x64" end def x64_mingw? - Bundler::WINDOWS && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mingw32" && Bundler.local_platform.cpu == "x64" + Gem.win_platform? && Bundler.local_platform != Gem::Platform::RUBY && Bundler.local_platform.os == "mingw32" && Bundler.local_platform.cpu == "x64" end (KNOWN_MINOR_VERSIONS + KNOWN_MAJOR_VERSIONS).each do |version| |