From: Richard W.M. Jones <rjones@redhat.com>
Date: Fri, 3 Jan 2020 08:11:18 +0000 (+0000)
Subject: eval: Don't check target was rebuilt if there is no code.
X-Git-Tag: v'0.2'~103
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=eb96a7b791ac414a861a31e93e3336924daaecbe;p=goals.git

eval: Don't check target was rebuilt if there is no code.

A pure dependency rule like:

  "foo.o": "foo.c"

doesn't contain any code, so it doesn't make sense to check if the
target has been rebuilt.
---

diff --git a/src/eval.ml b/src/eval.ml
index 39b0893..cf7ab64 100644
--- a/src/eval.ml
+++ b/src/eval.ml
@@ -101,7 +101,8 @@ and run_goal env loc name args (params, patterns, deps, code) =
   if rebuild then (
     (* Run the code (if any). *)
     (match code with
-     | None -> ()
+     | None -> () (* No { CODE } section. *)
+
      | Some code ->
         (* Add some standard variables to the environment. *)
         let expr_of_substs s = Ast.ESubsts (Ast.noloc, s) in
@@ -122,20 +123,22 @@ and run_goal env loc name args (params, patterns, deps, code) =
         if r <> 0 then (
           eprintf "*** goal ‘%s’ failed with exit code %d\n" name r;
           exit 1
-        )
-    );
-
-    (* Check all targets were updated (else it's an error). *)
-    let pattern_still_needs_rebuild =
-      try Some (List.find (needs_rebuild env loc deps) patterns)
-      with Not_found -> None in
-    match pattern_still_needs_rebuild with
-    | None -> ()
-    | Some pattern ->
-       failwithf "%a: goal ‘%s’ ran successfully but it did not rebuild %a"
-         Ast.string_loc loc
-         name
-         Ast.string_pattern pattern
+        );
+
+        (* Check all targets were updated after the code was
+         * run (else it's an error).
+         *)
+        let pattern_still_needs_rebuild =
+          try Some (List.find (needs_rebuild env loc deps) patterns)
+          with Not_found -> None in
+        match pattern_still_needs_rebuild with
+        | None -> ()
+        | Some pattern ->
+           failwithf "%a: goal ‘%s’ ran successfully but it did not rebuild %a"
+             Ast.string_loc loc
+             name
+             Ast.string_pattern pattern
+    )
   )
 
 (* Return whether the target (pattern) needs to be rebuilt. *)