summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-03-06 07:47:53 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-03-06 07:47:53 +0000
commite0d6392791a4a81091c7e3016312316f1415bf3c (patch)
tree4a5600958fb47e18d3fe56be50a32b434e74aafe /lib
parent32f7b501bb269ba3459227323cfb8d1b0f1cdbe9 (diff)
merge revision(s) 67006: [Backport #15469]
Ignore to add bundler lib direcotry if it is same as rubylibdir. [Bug #15469][ruby-core:90742] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/shared_helpers.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
index 3e2fe24b7a..a4c09e36eb 100644
--- a/lib/bundler/shared_helpers.rb
+++ b/lib/bundler/shared_helpers.rb
@@ -340,7 +340,7 @@ module Bundler
def set_rubylib
rubylib = (ENV["RUBYLIB"] || "").split(File::PATH_SEPARATOR)
- rubylib.unshift bundler_ruby_lib
+ rubylib.unshift bundler_ruby_lib unless RbConfig::CONFIG["rubylibdir"] == bundler_ruby_lib
Bundler::SharedHelpers.set_env "RUBYLIB", rubylib.uniq.join(File::PATH_SEPARATOR)
end