aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--stage1/Stage1.scala2
-rw-r--r--stage2/Stage2.scala3
2 files changed, 2 insertions, 3 deletions
diff --git a/stage1/Stage1.scala b/stage1/Stage1.scala
index c94d1a4..e20a046 100644
--- a/stage1/Stage1.scala
+++ b/stage1/Stage1.scala
@@ -165,7 +165,7 @@ object Stage1{
val stage2Args = Stage2Args(
new File( args.args(0) ),
- args.args.drop(1).toVector,
+ args.args.drop(1).dropWhile(_ == "direct").toVector,
// launcher changes cause entire nailgun restart, so no need for them here
cbtHasChanged = cbtHasChanged,
classLoaderCache = classLoaderCache,
diff --git a/stage2/Stage2.scala b/stage2/Stage2.scala
index 3d5c244..b1539bf 100644
--- a/stage2/Stage2.scala
+++ b/stage2/Stage2.scala
@@ -19,10 +19,9 @@ object Stage2 extends Stage2Base{
logger.stage2(s"Stage2 start")
val loop = args.args.lift(0) == Some("loop")
- val direct = args.args.lift(0) == Some("direct")
val cross = args.args.lift(0) == Some("cross")
- val taskIndex = if (loop || direct || cross) {
+ val taskIndex = if (loop || cross) {
1
} else {
0