diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2020-11-18 12:51:49 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2020-11-19 13:07:57 +0300 |
| commit | f91468192ad7066a5e6fa63ddc4e4231e632a457 (patch) | |
| tree | 5e399478261a27e8b2298b0f56b08a0e5b7dc3ab /libbuild2/adhoc-rule-buildscript.cxx | |
| parent | 15507d112650477ad64a5c9b19b4e515124affec (diff) | |
Remove target files on ad hoc rule update buildscript error
Diffstat (limited to 'libbuild2/adhoc-rule-buildscript.cxx')
| -rw-r--r-- | libbuild2/adhoc-rule-buildscript.cxx | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/libbuild2/adhoc-rule-buildscript.cxx b/libbuild2/adhoc-rule-buildscript.cxx index a09d2c7..9470d3c 100644 --- a/libbuild2/adhoc-rule-buildscript.cxx +++ b/libbuild2/adhoc-rule-buildscript.cxx @@ -10,7 +10,7 @@ #include <libbuild2/target.hxx> #include <libbuild2/context.hxx> #include <libbuild2/algorithm.hxx> -#include <libbuild2/filesystem.hxx> // path_perms() +#include <libbuild2/filesystem.hxx> // path_perms(), auto_rmfile #include <libbuild2/diagnostics.hxx> #include <libbuild2/parser.hxx> // attributes @@ -563,6 +563,20 @@ namespace build2 if (!ctx.dry_run || verb >= 2) { + // On failure remove the target files that may potentially exist but + // be invalid. + // + small_vector<auto_rmfile, 8> rms; + + if (!ctx.dry_run) + { + for (const target* m (&t); m != nullptr; m = m->adhoc_member) + { + if (auto* f = m->is_a<file> ()) + rms.emplace_back (f->path ()); + } + } + build::script::default_runner r; p.execute (*rs, *bs, e, script, r); @@ -588,6 +602,9 @@ namespace build2 } #endif dd.check_mtime (tp); + + for (auto& rm: rms) + rm.cancel (); } } } |