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._