Skip to content

Commit

Permalink
Revert "Shared path is gone and site dir is not there by default."
Browse files Browse the repository at this point in the history
This reverts commit c5b3e02.
  • Loading branch information
enebo committed Apr 7, 2015
1 parent 9bba871 commit 6cff710
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions core/src/main/java/org/jruby/runtime/load/LoadService.java
Expand Up @@ -229,10 +229,7 @@ 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)
String siteDir = RbConfigLibrary.getSiteDir(runtime);
if (new File(siteDir).exists()) {
addPath(siteDir);
}
addPath(RbConfigLibrary.getSiteDir(runtime));
// if vendorDirGeneral is different than siteDirGeneral,
// add vendorDir, too
// adding {vendor,site}{Lib,Arch}Dir dirs is not necessary,
Expand All @@ -244,6 +241,8 @@ public void init(List prependDirectories) {
if (rubygemsDir != null) {
addPath(rubygemsDir);
}
addPath(RbConfigLibrary.getRubySharedLibDir(runtime));
// TODO: merge
addPath(RbConfigLibrary.getRubyLibDir(runtime));
}

Expand Down

0 comments on commit 6cff710

Please sign in to comment.