From 345d2fbfcdf28b118806665cfff56c34ecdac93f Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sun, 14 Feb 2010 20:21:05 -0500 Subject: [PATCH] Fix issue where projects using scala-compiler.jar were always recompiled --- src/main/scala/sbt/Conditional.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/scala/sbt/Conditional.scala b/src/main/scala/sbt/Conditional.scala index e85e1c68e..d02c8e753 100644 --- a/src/main/scala/sbt/Conditional.scala +++ b/src/main/scala/sbt/Conditional.scala @@ -248,9 +248,10 @@ abstract class AbstractCompileConditional(val config: AbstractCompileConfigurati protected def productLastModified(product: Path) = product.asFile.lastModified private def libraryJar = compiler.scalaInstance.libraryJar + private def compilerJar = compiler.scalaInstance.compilerJar protected def externalInfo(externals: Iterable[File]) = { - val (classpathJars, classpathDirs) = ClasspathUtilities.buildSearchPaths(classpath.get) + val (classpathJars, classpathDirs) = ClasspathUtilities.buildSearchPaths(classpath.get ++ Seq(Path.fromFile(libraryJar), Path.fromFile(compilerJar))) for(external <- externals) yield { val available = external.exists && (external == libraryJar || ClasspathUtilities.onClasspath(classpathJars, classpathDirs, external) )