Removed static state from global object ClassPa...

Removed static state from global object ClassPath object, and some minor
repositioning while in there. Closes #2928, but the intentions behind
-optimise being intertwined with ClassPath could really use some source
comments. Review by rytz.

1 files changed, 3 insertions, 6 deletions

diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index 1128150cb8..76fa2ade93 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -211,16 +211,13 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable
         }
     }
 
-  lazy val classPath = {
-    ClassPath.XO = settings.XO.value
+  lazy val classPath =
     if (forMSIL)
-      new MsilClassPath(settings.assemextdirs.value, settings.assemrefs.value,
-                       settings.sourcepath.value)
+      new MsilClassPath(settings.assemextdirs.value, settings.assemrefs.value, settings.sourcepath.value, settings.XO.value)
     else
       new JavaClassPath(settings.bootclasspath.value, settings.extdirs.value,
                         settings.classpath.value, settings.sourcepath.value,
-                        settings.Xcodebase.value)
-  }
+                        settings.Xcodebase.value, settings.XO.value)
 
   if (settings.verbose.value) {
     inform("[Classpath = " + classPath + "]")