Skip to content

Commit c5b3e02

Browse files
committed
Shared path is gone and site dir is not there by default.
1 parent 1dc5a7f commit c5b3e02

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

core/src/main/java/org/jruby/runtime/load/LoadService.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,10 @@ public void init(List prependDirectories) {
229229
if (jrubyHome != null) {
230230
// siteDir has to come first, because rubygems insert paths after it
231231
// and we must to prefer Gems to rubyLibDir/rubySharedLibDir (same as MRI)
232-
addPath(RbConfigLibrary.getSiteDir(runtime));
232+
String siteDir = RbConfigLibrary.getSiteDir(runtime);
233+
if (new File(siteDir).exists()) {
234+
addPath(siteDir);
235+
}
233236
// if vendorDirGeneral is different than siteDirGeneral,
234237
// add vendorDir, too
235238
// adding {vendor,site}{Lib,Arch}Dir dirs is not necessary,
@@ -241,8 +244,6 @@ public void init(List prependDirectories) {
241244
if (rubygemsDir != null) {
242245
addPath(rubygemsDir);
243246
}
244-
addPath(RbConfigLibrary.getRubySharedLibDir(runtime));
245-
// TODO: merge
246247
addPath(RbConfigLibrary.getRubyLibDir(runtime));
247248
}
248249

0 commit comments

Comments
 (0)