summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/util/PathResolver.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-09-28 12:29:23 +0000
committerPaul Phillips <paulp@improving.org>2011-09-28 12:29:23 +0000
commit444914a8818db4d9eef68213cf247ba3b76e15b0 (patch)
treed91486ad960f6672fd7836e5d17eb6ff3056d2fc /src/compiler/scala/tools/util/PathResolver.scala
parent9ef01e68851ae6045ce4dd1aa7d5f921a4bc7f0d (diff)
downloadscala-444914a8818db4d9eef68213cf247ba3b76e15b0.tar.gz
scala-444914a8818db4d9eef68213cf247ba3b76e15b0.tar.bz2
scala-444914a8818db4d9eef68213cf247ba3b76e15b0.zip
Fix for classpaths.
Not sys.props("CLASSPATH"), sys.env("CLASSPATH"). No review.
Diffstat (limited to 'src/compiler/scala/tools/util/PathResolver.scala')
-rw-r--r--src/compiler/scala/tools/util/PathResolver.scala5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/util/PathResolver.scala b/src/compiler/scala/tools/util/PathResolver.scala
index c5d0e1edea..788891a062 100644
--- a/src/compiler/scala/tools/util/PathResolver.scala
+++ b/src/compiler/scala/tools/util/PathResolver.scala
@@ -205,10 +205,7 @@ class PathResolver(settings: Settings, context: JavaContext) {
def userClassPath = (
if (!settings.classpath.isDefault)
settings.classpath.value
- else sys.props("CLASSPATH") match {
- case null => "."
- case cp => cp
- }
+ else sys.env.getOrElse("CLASSPATH", ".")
)
import context._