summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2006-03-27 15:38:29 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2006-03-27 15:38:29 +0000
commitf9874202d8e8df2fbe861a6194d404a64d04fbd5 (patch)
treecfdce36885b8de30f86dce944f9d9fce6bc921de
parent76f0380dd77143fe01c50c469588ca7d1fb59224 (diff)
downloadscala-f9874202d8e8df2fbe861a6194d404a64d04fbd5.tar.gz
scala-f9874202d8e8df2fbe861a6194d404a64d04fbd5.tar.bz2
scala-f9874202d8e8df2fbe861a6194d404a64d04fbd5.zip
Modified Scalac settings so that, when not used...
Modified Scalac settings so that, when not used with the scalac script, the JVM user class path is used when -classpath is not set.
-rw-r--r--src/compiler/scala/tools/nsc/Settings.scala9
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(