Skip to content

Commit

Permalink
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
Original file line number Diff line number Diff line change
@@ -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,
@@ -244,6 +241,8 @@ public void init(List prependDirectories) {
if (rubygemsDir != null) {
addPath(rubygemsDir);
}
addPath(RbConfigLibrary.getRubySharedLibDir(runtime));
// TODO: merge
addPath(RbConfigLibrary.getRubyLibDir(runtime));
}

0 comments on commit 6cff710

Please sign in to comment.