diff options
| author | Paul Phillips <paulp@improving.org> | 2009-08-19 14:18:08 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2009-08-19 14:18:08 +0000 |
| commit | 169a6a323f4c17dea9619cd43ba3d84d36001797 (patch) | |
| tree | a65a8ebd2b286c4dd0dbe222dde8f60b7f245f68 | |
| parent | c55580014c7d2aec878e9bd6387ba1f740083176 (diff) | |
| download | scala-169a6a323f4c17dea9619cd43ba3d84d36001797.tar.gz scala-169a6a323f4c17dea9619cd43ba3d84d36001797.tar.bz2 scala-169a6a323f4c17dea9619cd43ba3d84d36001797.zip | |
Put scala-library.jar back on the boot classpath.
| -rw-r--r-- | src/compiler/scala/tools/nsc/Settings.scala | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala index af0e0293fe..ed75a563b5 100644 --- a/src/compiler/scala/tools/nsc/Settings.scala +++ b/src/compiler/scala/tools/nsc/Settings.scala @@ -25,9 +25,12 @@ class Settings(errorFn: String => Unit) extends ScalacSettings { protected def classpathDefault = syspropopt("env.classpath") orElse syspropopt("java.class.path") getOrElse "" - protected def bootclasspathDefault = syspropopt("sun.boot.class.path") getOrElse "" + protected def bootclasspathDefault = + concatPath(syspropopt("sun.boot.class.path"), guessedScalaBootClassPath) + // syspropopt("sun.boot.class.path") getOrElse "" // XXX scala-library.jar was being added to both boot and regular classpath until 8/18/09 - // concatPath(syspropopt("sun.boot.class.path"), guessedScalaBootClassPath) + // Removing from boot classpath caused build/quick/bin/scala to fail. + // Note to self, figure out how/why the bootclasspath is tied up with the locker/quick/pack. protected def extdirsDefault = concatPath(syspropopt("java.ext.dirs"), guessedScalaExtDirs) |