aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2022-03-21 13:38:52 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2022-03-21 13:38:52 +0200
commit5a4efaa7ce675c0f68a94aeb822d82896bd29a2d (patch)
tree590af2e3a2d0e973d61d9ed4f45f82ad5386767c
parent2bb461f433da1a121dafc96a95363618795bd7fb (diff)
Make sure install group rule take precedence over fallback file rule
-rw-r--r--libbuild2/install/init.cxx10
1 files changed, 8 insertions, 2 deletions
diff --git a/libbuild2/install/init.cxx b/libbuild2/install/init.cxx
index 25dc845..1bf1623 100644
--- a/libbuild2/install/init.cxx
+++ b/libbuild2/install/init.cxx
@@ -380,12 +380,18 @@ namespace build2
bs.insert_rule<file> (perform_install_id, "install.file", fr);
bs.insert_rule<file> (perform_uninstall_id, "uninstall.file", fr);
- bs.insert_rule<target> (perform_install_id, "install.file", gr);
- bs.insert_rule<target> (perform_uninstall_id, "uninstall.file", gr);
+ // Note: use mtime_target (instead of target) to take precedence over
+ // the fallback file rules below.
+ //
+ bs.insert_rule<mtime_target> (perform_install_id, "install.group", gr);
+ bs.insert_rule<mtime_target> (perform_uninstall_id, "uninstall.group", gr);
// Register the fallback file rule for the update-for-[un]install
// operation, similar to update.
//
+ // @@ Hm, it's a bit fuzzy why we would be updating-for-install
+ // something outside of any project..?
+ //
rs.global_scope ().insert_rule<mtime_target> (
perform_install_id, "install.file", fr);