aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bundler
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2018-11-25 13:25:17 +0000
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2019-08-03 09:30:00 +0900
commit4dea1356c3ea97e9d0e98b1fbca69b01a6df2647 (patch)
tree27f9833932d3ffa85b91668dc60e826c7a7d1eba /lib/bundler
parent6fb73e6043015fcd999a2c4b9a52b9bb1d9c4173 (diff)
downloadruby-4dea1356c3ea97e9d0e98b1fbca69b01a6df2647.tar.gz
[bundler/bundler] [CurrentRuby] Say we are ruby? when the generic local platform is Gem::Platform::RUBY
This allows us to always say we're ruby? when force_ruby_platform is set, and fixes using gemspec & force_ruby_platform on windows. https://github.com/bundler/bundler/commit/3cb89b7e5c
Diffstat (limited to 'lib/bundler')
-rw-r--r--lib/bundler/current_ruby.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/bundler/current_ruby.rb b/lib/bundler/current_ruby.rb
index 6c8ad72ee3..c132e8ecc0 100644
--- a/lib/bundler/current_ruby.rb
+++ b/lib/bundler/current_ruby.rb
@@ -38,6 +38,8 @@ module Bundler
].freeze
def ruby?
+ return true if Bundler::GemHelpers.generic_local_platform == Gem::Platform::RUBY
+
!mswin? && (RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx" || RUBY_ENGINE == "maglev" || RUBY_ENGINE == "truffleruby")
end