From 107f62303794fa14b05c211d52dddc1f50f14886 Mon Sep 17 00:00:00 2001
From: Christopher Vogt <oss.nsp@cvogt.org>
Date: Sat, 2 Apr 2016 19:59:16 -0400
Subject: propagate info if cbt has changed across builds, so they can be
 re-compiled

---
 nailgun_launcher/NailgunLauncher.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'nailgun_launcher/NailgunLauncher.java')

diff --git a/nailgun_launcher/NailgunLauncher.java b/nailgun_launcher/NailgunLauncher.java
index de55821..c94a6d2 100644
--- a/nailgun_launcher/NailgunLauncher.java
+++ b/nailgun_launcher/NailgunLauncher.java
@@ -69,16 +69,16 @@ public class NailgunLauncher{
       }
     }
 
-    Boolean stage1SourcesChanged = false;
+    Boolean changed = lastSuccessfullCompile == 0;
     for( File file: stage1SourceFiles ){
       if( file.lastModified() > lastSuccessfullCompile ){
-        stage1SourcesChanged = true;
+        changed = true;
         //System.err.println("File change: "+file.lastModified());
         break;
       }
     }
 
-    if(stage1SourcesChanged || stage1classLoader == null){
+    if(changed){
       EarlyDependencies earlyDeps = new EarlyDependencies();
       int exitCode = zinc(earlyDeps, stage1SourceFiles);
       if( exitCode == 0 ){
@@ -103,7 +103,7 @@ public class NailgunLauncher{
         (Integer) stage1classLoader
           .loadClass("cbt.Stage1")
           .getMethod("run", String[].class, ClassLoader.class, Boolean.class)
-          .invoke( null, (Object) args, stage1classLoader, stage1SourcesChanged);
+          .invoke( null, (Object) args, stage1classLoader, changed);
       System.exit(exitCode);
     }catch(Exception e){
       System.err.println(stage1classLoader);
-- 
cgit v1.2.3