summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-01-31 07:09:06 -0800
committerPaul Phillips <paulp@improving.org>2013-01-31 07:09:06 -0800
commitba72ee7c6f556827a1e8100d9193f0452c5313a1 (patch)
tree8bca466ea542846c99f1e53b07795e054f3a8387 /src
parent27d73a23525aa66d5e07c96fe02b1f690866159c (diff)
parent166fd02ba1628b0604ba49ce0e6347ca356f9141 (diff)
downloadscala-ba72ee7c6f556827a1e8100d9193f0452c5313a1.tar.gz
scala-ba72ee7c6f556827a1e8100d9193f0452c5313a1.tar.bz2
scala-ba72ee7c6f556827a1e8100d9193f0452c5313a1.zip
Merge pull request #2031 from JamesIry/2.10.x_SI-6669
SI-6669 Add . to the default scalap classpath
Diffstat (limited to 'src')
-rw-r--r--src/scalap/scala/tools/scalap/Main.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scalap/scala/tools/scalap/Main.scala b/src/scalap/scala/tools/scalap/Main.scala
index 7c84279699..90f8cb8d71 100644
--- a/src/scalap/scala/tools/scalap/Main.scala
+++ b/src/scalap/scala/tools/scalap/Main.scala
@@ -184,7 +184,7 @@ object Main extends Main {
val cparg = List("-classpath", "-cp") map (arguments getArgument _) reduceLeft (_ orElse _)
val path = cparg match {
case Some(cp) => new JavaClassPath(DefaultJavaContext.classesInExpandedPath(cp), DefaultJavaContext)
- case _ => PathResolver.fromPathString("")
+ case _ => PathResolver.fromPathString(".") // include '.' in the default classpath SI-6669
}
// print the classpath if output is verbose
if (verbose)