diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2009-05-18 17:56:29 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2009-05-18 17:56:29 +0000 |
| commit | 3b5f98fd1cc16c0a21c3d8cff368f1a86aa8de93 (patch) | |
| tree | f3b638b4ada65d239902aa6d83cf8f5a1e9a1f2e /src/compiler | |
| parent | 3de51d6b76e87aad67a5f0b5177650cb78178b08 (diff) | |
| download | scala-3b5f98fd1cc16c0a21c3d8cff368f1a86aa8de93.tar.gz scala-3b5f98fd1cc16c0a21c3d8cff368f1a86aa8de93.tar.bz2 scala-3b5f98fd1cc16c0a21c3d8cff368f1a86aa8de93.zip | |
Fixed check for output directory when multiple ...
Fixed check for output directory when multiple outputs are used.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Settings.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala index 5f15cd804e..f0b3be3ff0 100644 --- a/src/compiler/scala/tools/nsc/Settings.scala +++ b/src/compiler/scala/tools/nsc/Settings.scala @@ -281,8 +281,8 @@ object Settings /** Return the output directory for the given file. */ def outputDirFor(src: AbstractFile): AbstractFile = { - def isBelow(dir: AbstractFile, f: AbstractFile) = - f.path.startsWith(dir.path) + def isBelow(srcDir: AbstractFile, outDir: AbstractFile) = + src.path.startsWith(srcDir.path) singleOutDir match { case Some(d) => d |