aboutsummaryrefslogtreecommitdiff
path: root/build2/dist/rule.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'build2/dist/rule.cxx')
-rw-r--r--build2/dist/rule.cxx39
1 files changed, 36 insertions, 3 deletions
diff --git a/build2/dist/rule.cxx b/build2/dist/rule.cxx
index ab00d41..b288a66 100644
--- a/build2/dist/rule.cxx
+++ b/build2/dist/rule.cxx
@@ -36,12 +36,45 @@ namespace build2
if (p.proj ())
continue;
- const target& pt (p.search (t));
+ // We used to always search and match but that resulted in the
+ // undesirable behavior in case one of the "source" files is
+ // missing. In this case we would enter a target as "output", this
+ // rule would match it, and then dist_execute() would ignore it by
+ // default.
+ //
+ // So now if this is a file target (we still want to always "see
+ // through" other targets like aliases), we will only match it if (1)
+ // it exists in src or (2) it exists as a target. It feels like we
+ // don't need the stronger "... and not implied" condition since if it
+ // is mentioned as a target, then it is in out (we don't do the same
+ // target in both src/out).
+ //
+ const target* pt (nullptr);
+ if (p.is_a<file> ())
+ {
+ pt = p.load ();
+
+ if (pt == nullptr)
+ {
+ // Search for an existing target or existing file in src.
+ //
+ const prerequisite_key& k (p.key ());
+ pt = k.tk.type->search (t, k);
+
+ if (pt == nullptr)
+ fail << "prerequisite " << k << " is not existing source file "
+ << "nor known output target" << endf;
+
+ search_custom (p.prerequisite, *pt); // Cache.
+ }
+ }
+ else
+ pt = &p.search (t);
// Don't match targets that are outside of our project.
//
- if (pt.dir.sub (out_root))
- build2::match (a, pt);
+ if (pt->dir.sub (out_root))
+ build2::match (a, *pt);
}
return noop_recipe; // We will never be executed.