ScalaClassLoader changes.

Lots of fiddling in the interests of a better classloading future.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index b798fe71ba..602ff6bf0e 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -1325,10 +1325,11 @@ object Global {
     // !!! The classpath isn't known until the Global is created, which is too
     // late, so we have to duplicate it here.  Classpath is too tightly coupled,
     // it is a construct external to the compiler and should be treated as such.
-    val loader = ScalaClassLoader.fromURLs(new PathResolver(settings).result.asURLs)
-    val name   = settings.globalClass.value
-    val clazz  = Class.forName(name, true, loader)
-    val cons   = clazz.getConstructor(classOf[Settings], classOf[Reporter])
+    val parentLoader = settings.explicitParentLoader getOrElse getClass.getClassLoader
+    val loader       = ScalaClassLoader.fromURLs(new PathResolver(settings).result.asURLs, parentLoader)
+    val name         = settings.globalClass.value
+    val clazz        = Class.forName(name, true, loader)
+    val cons         = clazz.getConstructor(classOf[Settings], classOf[Reporter])
 
     cons.newInstance(settings, reporter).asInstanceOf[Global]
   }