diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-19 15:35:06 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-19 15:35:06 +0200 |
| commit | 4776ab7859e71bb6cec004a1aea05324ad33fd1d (patch) | |
| tree | 33d37fd63f6d8d0d6a10f8373458da07fe438dc0 /build2/cc/module.cxx | |
| parent | d19ae162c2cf8059b3145ded8cfbce2ab01c8fc6 (diff) | |
Implement uninstall operation
Diffstat (limited to 'build2/cc/module.cxx')
| -rw-r--r-- | build2/cc/module.cxx | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/build2/cc/module.cxx b/build2/cc/module.cxx index ec7178b..d3849e1 100644 --- a/build2/cc/module.cxx +++ b/build2/cc/module.cxx @@ -307,30 +307,32 @@ namespace build2 link& lr (*this); install& ir (*this); - r.insert<obje> (perform_update_id, x_compile, cr); - r.insert<obje> (perform_clean_id, x_compile, cr); - r.insert<obje> (configure_update_id, x_compile, cr); + r.insert<obje> (perform_update_id, x_compile, cr); + r.insert<obje> (perform_clean_id, x_compile, cr); + r.insert<obje> (configure_update_id, x_compile, cr); - r.insert<exe> (perform_update_id, x_link, lr); - r.insert<exe> (perform_clean_id, x_link, lr); - r.insert<exe> (configure_update_id, x_link, lr); + r.insert<exe> (perform_update_id, x_link, lr); + r.insert<exe> (perform_clean_id, x_link, lr); + r.insert<exe> (configure_update_id, x_link, lr); - r.insert<exe> (perform_install_id, x_install, ir); + r.insert<exe> (perform_install_id, x_install, ir); + r.insert<exe> (perform_uninstall_id, x_uninstall, ir); // Only register static object/library rules if the bin.ar module is // loaded (by us or by the user). // if (cast_false<bool> (b["bin.ar.loaded"])) { - r.insert<obja> (perform_update_id, x_compile, cr); - r.insert<obja> (perform_clean_id, x_compile, cr); - r.insert<obja> (configure_update_id, x_compile, cr); + r.insert<obja> (perform_update_id, x_compile, cr); + r.insert<obja> (perform_clean_id, x_compile, cr); + r.insert<obja> (configure_update_id, x_compile, cr); - r.insert<liba> (perform_update_id, x_link, lr); - r.insert<liba> (perform_clean_id, x_link, lr); - r.insert<liba> (configure_update_id, x_link, lr); + r.insert<liba> (perform_update_id, x_link, lr); + r.insert<liba> (perform_clean_id, x_link, lr); + r.insert<liba> (configure_update_id, x_link, lr); - r.insert<liba> (perform_install_id, x_install, ir); + r.insert<liba> (perform_install_id, x_install, ir); + r.insert<liba> (perform_uninstall_id, x_uninstall, ir); } r.insert<objs> (perform_update_id, x_compile, cr); @@ -341,7 +343,8 @@ namespace build2 r.insert<libs> (perform_clean_id, x_link, lr); r.insert<libs> (configure_update_id, x_link, lr); - r.insert<libs> (perform_install_id, x_install, ir); + r.insert<libs> (perform_install_id, x_install, ir); + r.insert<libs> (perform_uninstall_id, x_uninstall, ir); } } } |