aboutsummaryrefslogtreecommitdiff
path: root/stage1
diff options
context:
space:
mode:
authorJan Christopher Vogt <oss.nsp@cvogt.org>2016-11-13 16:17:18 -0500
committerGitHub <noreply@github.com>2016-11-13 16:17:18 -0500
commit90edc50237d3ea248bb795052195163df716bb41 (patch)
tree1ece4f38c6a24f813d3fed2ed304466666d96f24 /stage1
parent46c1a8d989db3fd9903365158d2bc552d77bcc38 (diff)
parentada8e5e1d414a02b50962f4405fafccb0698e7d9 (diff)
downloadcbt-90edc50237d3ea248bb795052195163df716bb41.tar.gz
cbt-90edc50237d3ea248bb795052195163df716bb41.tar.bz2
cbt-90edc50237d3ea248bb795052195163df716bb41.zip
Merge pull request #309 from cvogt/slim-context
Clean ups / minor fixes
Diffstat (limited to 'stage1')
-rw-r--r--stage1/Stage1.scala9
1 files changed, 7 insertions, 2 deletions
diff --git a/stage1/Stage1.scala b/stage1/Stage1.scala
index 81b008f..d559dd4 100644
--- a/stage1/Stage1.scala
+++ b/stage1/Stage1.scala
@@ -72,8 +72,13 @@ object Stage1{
classLoader
.loadClass("cbt.Stage2")
- .getMethod( "getBuild", classOf[java.lang.Object], classOf[java.lang.Boolean] )
- .invoke(null, context, (buildStage1.changed || changed): java.lang.Boolean)
+ .getMethod( "getBuild", classOf[Context] )
+ .invoke(
+ null,
+ context.copy(
+ cbtHasChanged = context.cbtHasChanged || buildStage1.changed || changed // might be redundant
+ )
+ )
}
def buildStage2(