diff options
| author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-12 15:49:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-12 15:49:08 -0400 |
| commit | c14e288996d2b56b6b06a0624f4f2fca315369c7 (patch) | |
| tree | 5fde2735672672582aa5681acc146a8d0d3d60e9 /stage1 | |
| parent | a6eadada6e6d1f9efa1b5edecef5ce42b2099706 (diff) | |
| parent | 8567e2557467f838e371fd8e6b267d5a417ef78e (diff) | |
| download | cbt-c14e288996d2b56b6b06a0624f4f2fca315369c7.tar.gz cbt-c14e288996d2b56b6b06a0624f4f2fca315369c7.tar.bz2 cbt-c14e288996d2b56b6b06a0624f4f2fca315369c7.zip | |
Merge pull request #423 from cvogt/chris
various changes
Diffstat (limited to 'stage1')
| -rw-r--r-- | stage1/Stage1.scala | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/stage1/Stage1.scala b/stage1/Stage1.scala index 85ec0e9..48d0ae9 100644 --- a/stage1/Stage1.scala +++ b/stage1/Stage1.scala @@ -5,8 +5,7 @@ import java.util._ import scala.collection.JavaConverters._ -final case class Stage1ArgsParser(__args: Seq[String]) { - val _args = __args.drop(1) +final case class Stage1ArgsParser(_args: Seq[String]) { /** * Raw parameters including their `-D` flag. **/ @@ -162,7 +161,7 @@ object Stage1{ buildStage1: BuildStage1Result, persistentCache: java.util.Map[AnyRef,AnyRef] ): Int = { - val args = Stage1ArgsParser(_args.toVector) + val args = Stage1ArgsParser(_args.toVector.drop(1)) implicit val logger = new Logger(args.enabledLoggers, buildStage1.start) logger.stage1(s"Stage1 start") @@ -173,7 +172,7 @@ object Stage1{ val stage2Args = new Stage2Args( new File( args.args(0) ), - args.args.drop(1).dropWhile(_ == "direct").toVector, + args.args.drop(1).toVector, // launcher changes cause entire nailgun restart, so no need for them here stage2LastModified = stage2LastModified, cache, |