aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-06 00:15:08 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-06 00:15:08 +0000
commitddd42d6472b42335d6dc196a2b5282a6e96cd4b4 (patch)
treee45aba7a7f6852e2bc535ef817fef444f54ac234
parent3d8e9cd260aa76d504dd06be3e1278ddc21e88e4 (diff)
downloadruby-ddd42d6472b42335d6dc196a2b5282a6e96cd4b4.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.rb2
-rw-r--r--spec/bundler/support/helpers.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/rubygems/ext/rake_builder.rb b/lib/rubygems/ext/rake_builder.rb
index ec904e6..4b3534b 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 691e738..192747d 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