From 3c5d8ab29b664e540046b50f2f0167f05f3ba615 Mon Sep 17 00:00:00 2001 From: Artyom Olshevskiy Date: Thu, 21 Oct 2010 09:12:00 -0400 Subject: [PATCH] support -J options when forking (#124) --- compile/JavaCompiler.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compile/JavaCompiler.scala b/compile/JavaCompiler.scala index 5c74101a8..fede38d44 100644 --- a/compile/JavaCompiler.scala +++ b/compile/JavaCompiler.scala @@ -45,8 +45,9 @@ object JavaCompiler /** `doFork` should be a function that forks javac with the provided arguments and sends output to the given Logger.*/ def forkJavac(implicit doFork: Fork) = (arguments: Seq[String], log: Logger) => { - def externalJavac(argFile: File) = doFork(("@" + normalizeSlash(argFile.getAbsolutePath)) :: Nil, log) - withArgumentFile(arguments)(externalJavac) + val (jArgs, nonJArgs) = arguments.partition(_.startsWith("-J")) + def externalJavac(argFile: File) = doFork(jArgs :+ ("@" + normalizeSlash(argFile.getAbsolutePath)), log) + withArgumentFile(nonJArgs)(externalJavac) } val directJavac = (arguments: Seq[String], log: Logger) => {