diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-07-16 10:01:35 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-07-16 10:01:35 +0200 |
| commit | 743e8badadc4b9997a6847e9aa60492297f2c5ff (patch) | |
| tree | 51c5c735300ecaa68b4c2ec9a146348bc2167c48 /src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | |
| parent | 476434df55caae615e5b96423b5f66ad88cbe8ae (diff) | |
| parent | bca59cc6d347d4bbf58f95510a5101b397224aeb (diff) | |
| download | scala-743e8badadc4b9997a6847e9aa60492297f2c5ff.tar.gz scala-743e8badadc4b9997a6847e9aa60492297f2c5ff.tar.bz2 scala-743e8badadc4b9997a6847e9aa60492297f2c5ff.zip | |
Merge pull request #4627 from som-snytt/issue/9396
SI-9396 Runner computes path only once
Diffstat (limited to 'src/compiler/scala/tools/nsc/settings/ScalaSettings.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index dedf268b56..f15bd3c31c 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -22,13 +22,9 @@ trait ScalaSettings extends AbsScalaSettings /** Set of settings */ protected[scala] lazy val allSettings = mutable.HashSet[Setting]() - /** Against my better judgment, giving in to martin here and allowing - * CLASSPATH to be used automatically. So for the user-specified part - * of the classpath: - * - * - If -classpath or -cp is given, it is that - * - Otherwise, if CLASSPATH is set, it is that - * - If neither of those, then "." is used. + /** The user class path, specified by `-classpath` or `-cp`, + * defaults to the value of CLASSPATH env var if it is set, as in Java, + * or else to `"."` for the current user directory. */ protected def defaultClasspath = sys.env.getOrElse("CLASSPATH", ".") |