diff -r c16ed3250de0 -r fa10b0f589c3 src/Pure/Tools/build.scala
--- a/src/Pure/Tools/build.scala	Sat Sep 02 12:09:07 2017 +0200
+++ b/src/Pure/Tools/build.scala	Sat Sep 02 12:55:44 2017 +0200
@@ -525,11 +525,11 @@
                       using(SQLite.open_database(database))(store.read_build(_, name)) match {
                         case Some(build) =>
                           val current =
+                            build.return_code == 0 &&
                             build.sources == sources_stamp(name) &&
                             build.input_heaps == ancestor_heaps &&
                             build.output_heap == heap_stamp &&
-                            !(do_output && heap_stamp.isEmpty) &&
-                            build.return_code == 0
+                            !(do_output && heap_stamp.isEmpty)
                           (current, heap_stamp)
                         case None => (false, None)
                       }