diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/Settings.scala | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala index d6f86f593f..780f33cdc9 100644 --- a/src/compiler/scala/tools/nsc/Settings.scala +++ b/src/compiler/scala/tools/nsc/Settings.scala @@ -18,9 +18,12 @@ class Settings(error: String => unit) { else null private val classpathDefault = - alternatePath( - getProperty("env.classpath"), - ".") + if (System.getProperty("env.classpath") != null) + alternatePath( + getProperty("env.classpath"), + ".") + else getProperty("java.class.path") + private val bootclasspathDefault = alternatePath( |