diff options
| author | Paul Phillips <paulp@improving.org> | 2013-02-01 17:38:56 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-02-01 17:38:56 -0800 |
| commit | a45a78a1d4111709acdc0bca9a1ac869a8e53ea5 (patch) | |
| tree | 5c909c41db2470c460cbb3c33672294c9342b914 /src/scalap | |
| parent | 26de4394b19d6614b7d414b33f66ebf7adcb8833 (diff) | |
| parent | 644eb7078a11613a06dcaaefb807cbcc44f65ea7 (diff) | |
| download | scala-a45a78a1d4111709acdc0bca9a1ac869a8e53ea5.tar.gz scala-a45a78a1d4111709acdc0bca9a1ac869a8e53ea5.tar.bz2 scala-a45a78a1d4111709acdc0bca9a1ac869a8e53ea5.zip | |
Merge commit '644eb7078a' into wip/fresh-merge2
Conflicts:
build.xml
src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
Diffstat (limited to 'src/scalap')
| -rw-r--r-- | src/scalap/scala/tools/scalap/Main.scala | 2 |
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) |