The compiler now takes care of its parameter cl...

The compiler now takes care of its parameter class path all by itself.

1 files changed, 11 insertions, 5 deletions

diff --git a/src/compiler/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala
index c27f61b0be..97ca2dac6b 100644
--- a/src/compiler/scala/tools/nsc/Settings.scala
+++ b/src/compiler/scala/tools/nsc/Settings.scala
@@ -7,18 +7,22 @@
 package scala.tools.nsc
 
 import java.io.File
-import System.getProperty
 
 class Settings(error: String => unit) {
 
   private var allsettings: List[Setting] = List()
 
+  private def getProperty(name: String): String =
+    if (System.getProperty(name) != "")
+      System.getProperty(name)
+    else null
+
   private val classpathDefault =
     alternatePath(
-      concatPath(
-        getProperty("java.class.path"),
-        getProperty("scala.class.path")),
-      "")
+      getProperty("env.classpath"),
+      alternatePath(
+        getProperty("scala.class.path"),
+        "."))
 
   private val bootclasspathDefault =
     alternatePath(
@@ -58,6 +62,8 @@ class Settings(error: String => unit) {
   val noassertions  = BooleanSetting("-noassert", "Generate no assertions and assumptions")
   val verbose       = BooleanSetting("-verbose", "Output messages about what the compiler is doing")
   val classpath     = StringSetting ("-classpath", "path", "Specify where to find user class files", classpathDefault)
+  // This is a hack: it should really be part of the extension path, but since extension only accepts dirs, I add it to the end of classpath.
+  classpath.value = concatPath(classpath.value, getProperty("scala.ext.path"))
   val sourcepath    = StringSetting ("-sourcepath", "path", "Specify where to find input source files", "")
   val bootclasspath = StringSetting ("-bootclasspath", "path", "Override location of bootstrap class files", bootclasspathDefault)
   val extdirs       = StringSetting ("-extdirs", "dirs", "Override location of installed extensions", extdirsDefault)