exclude sourcepath from classpath.

3 files changed, 8 insertions, 3 deletions

diff --git a/src/compiler/scala/tools/nsc/CompileClient.scala b/src/compiler/scala/tools/nsc/CompileClient.scala
index 3102a2ae44..752e9a7930 100644
--- a/src/compiler/scala/tools/nsc/CompileClient.scala
+++ b/src/compiler/scala/tools/nsc/CompileClient.scala
@@ -7,7 +7,6 @@ package scala.tools.nsc
 
 import java.io.{ BufferedReader, File, InputStreamReader, PrintWriter }
 import Properties.fileEndings
-import scala.tools.util.PathResolver
 import io.Path
 import settings.FscSettings
 
diff --git a/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala b/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala
index 8ef7310378..0842f6cb54 100644
--- a/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala
+++ b/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala
@@ -12,8 +12,9 @@ import scala.util.control.Breaks._
 import scala.tools.nsc.symtab.Flags
 
 import dependencies._
-import util.FakePos
+import util.{FakePos, ClassPath}
 import io.AbstractFile
+import scala.tools.util.PathResolver
 
 /** A more defined build manager, based on change sets. For each
  *  updated source file, it computes the set of changes to its
@@ -33,9 +34,15 @@ class RefinedBuildManager(val settings: Settings) extends Changes with BuildMana
       phasesSet += dependencyAnalysis
     }
 
+    override def classPath: ClassPath[_] = new NoSourcePathPathResolver(settings).result
+
     def newRun() = new Run()
   }
 
+  class NoSourcePathPathResolver(settings: Settings) extends PathResolver(settings) {
+    override def containers = Calculated.basis.dropRight(1).flatten.distinct
+  }
+
   protected def newCompiler(settings: Settings) = new BuilderGlobal(settings)
 
   val compiler = newCompiler(settings)
diff --git a/src/compiler/scala/tools/nsc/util/ClassPath.scala b/src/compiler/scala/tools/nsc/util/ClassPath.scala
index d64eb78cc5..1e29dd4fae 100644
--- a/src/compiler/scala/tools/nsc/util/ClassPath.scala
+++ b/src/compiler/scala/tools/nsc/util/ClassPath.scala
@@ -12,7 +12,6 @@ import scala.collection.mutable.ListBuffer
 import io.{ File, Directory, Path, AbstractFile }
 import scala.tools.util.StringOps.splitWhere
 import Path.isJarOrZip
-import scala.tools.util.PathResolver
 import File.pathSeparator
 
 /** <p>