diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-06 00:15:08 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-06 00:15:08 +0000 |
commit | 9de6c712b66aad77df40661c1fc6d37e9a5c251a (patch) | |
tree | e45aba7a7f6852e2bc535ef817fef444f54ac234 | |
parent | e810b5c96864647dc013505643469768bfe5531c (diff) | |
download | ruby-9de6c712b66aad77df40661c1fc6d37e9a5c251a.tar.gz |
No more ubygems in trunk
[Fix GH-1711]
Author: MSP-Greg <MSP-Greg@users.noreply.github.com>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | lib/rubygems/ext/rake_builder.rb | 2 | ||||
-rw-r--r-- | spec/bundler/support/helpers.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/rubygems/ext/rake_builder.rb b/lib/rubygems/ext/rake_builder.rb index ec904e6c11..4b3534bf35 100644 --- a/lib/rubygems/ext/rake_builder.rb +++ b/lib/rubygems/ext/rake_builder.rb @@ -20,7 +20,7 @@ class Gem::Ext::RakeBuilder < Gem::Ext::Builder rake = ENV['rake'] rake ||= begin - "#{Gem.ruby} -rubygems #{Gem.bin_path('rake', 'rake')}" + "#{Gem.ruby} -rrubygems #{Gem.bin_path('rake', 'rake')}" rescue Gem::Exception end diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb index 691e7381ff..192747da05 100644 --- a/spec/bundler/support/helpers.rb +++ b/spec/bundler/support/helpers.rb @@ -157,7 +157,7 @@ module Spec args = args.gsub(/(?=")/, "\\") args = %("#{args}") end - gem = ENV['BUNDLE_GEM'] || "#{Gem.ruby} -rubygems -S gem --backtrace" + gem = ENV['BUNDLE_GEM'] || "#{Gem.ruby} -rrubygems -S gem --backtrace" sys_exec("#{gem} #{command} #{args}") end bang :gem_command |