make filenames and paths be absolute before pas...

make filenames and paths be absolute before passing them to a
CompileServer

1 files changed, 13 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/ScriptRunner.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala
index 622eb2e3f1..8b65a0e0a3 100644
--- a/src/compiler/scala/tools/nsc/ScriptRunner.scala
+++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala
@@ -146,8 +146,20 @@ object ScriptRunner {
   /** Compile a script using the fsc compilation deamon */
   private def compileWithDaemon(
       settings: GenericRunnerSettings,
-      scriptFile: String): Boolean =
+      scriptFileIn: String): Boolean =
   {
+    val scriptFile = CompileClient.absFileName(scriptFileIn)
+    for {
+      val setting:settings.StringSetting <- List(
+            settings.classpath,
+            settings.sourcepath,
+            settings.bootclasspath,
+            settings.extdirs,
+            settings.outdir)
+    } {
+      setting.value = CompileClient.absFileNames(setting.value)
+    }
+
     val compSettingNames =
       (new Settings(error)).allSettings.map(.name)