Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a8e705c456be
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9800b443591e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 7, 2015

  1. Revert "Revert "Shared path is gone and site dir is not there by defa… 

    …ult.""

This reverts commit 6cff710.
    @headius
    headius committed Apr 7, 2015
    Copy the full SHA
    efb4a53 View commit details

  2. Make site_lib add unconditional, since RG needs it to insert paths.

    @headius
    headius committed Apr 7, 2015
    Copy the full SHA
    9800b44 View commit details
Showing with 5 additions and 2 deletions.
  1. +5 −2 core/src/main/java/org/jruby/runtime/load/LoadService.java
7 changes: 5 additions & 2 deletions core/src/main/java/org/jruby/runtime/load/LoadService.java
View file
Original file line number Diff line number Diff line change
@@ -229,7 +229,12 @@ public void init(List prependDirectories) {
if (jrubyHome != null) {
// siteDir has to come first, because rubygems insert paths after it
// and we must to prefer Gems to rubyLibDir/rubySharedLibDir (same as MRI)
// NOTE: this path *must* be added, whether it exists or not, because RubyGems
// uses it to know where to insert gem paths into the load path. Removing it
// causes all gem paths to be inserted at the beginning, overriding paths
// added via -I.
addPath(RbConfigLibrary.getSiteDir(runtime));

// if vendorDirGeneral is different than siteDirGeneral,
// add vendorDir, too
// adding {vendor,site}{Lib,Arch}Dir dirs is not necessary,
@@ -241,8 +246,6 @@ public void init(List prependDirectories) {
if (rubygemsDir != null) {
addPath(rubygemsDir);
}
addPath(RbConfigLibrary.getRubySharedLibDir(runtime));
// TODO: merge
addPath(RbConfigLibrary.getRubyLibDir(runtime));
}