summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/compiler/scala/tools/nsc/MainGenericRunner.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/MainGenericRunner.scala b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
index 44a9fe13e0..bb10a39325 100644
--- a/src/compiler/scala/tools/nsc/MainGenericRunner.scala
+++ b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
@@ -136,10 +136,12 @@ object MainGenericRunner {
urls(settings.Xcodebase.value)
command.thingToRun match {
- case None if settings.execute.value != "" =>
+ case _ if settings.execute.value != "" =>
+ val fullArgs =
+ command.thingToRun.toList ::: command.arguments
ScriptRunner.runCommand(settings,
settings.execute.value,
- command.arguments)
+ fullArgs)
case None =>
(new InterpreterLoop).main(settings)