diff options
| -rw-r--r-- | bbot/worker/worker.cxx | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx index 2630928..b019337 100644 --- a/bbot/worker/worker.cxx +++ b/bbot/worker/worker.cxx @@ -2402,8 +2402,7 @@ build (size_t argc, const char* argv[]) // Configure. // { - operation_result* pr (&add_result ("configure")); - operation_result& r (*pr); // @@ TMP: Apple Clang 14.0.3 ICE + operation_result& r (add_result ("configure")); // If we have auxiliary environment, show it in the logs. // @@ -3558,8 +3557,7 @@ build (size_t argc, const char* argv[]) // Update the main package. // { - operation_result* pr (&add_result ("update")); - operation_result& r (*pr); // @@ TMP: Apple Clang 14.0.3 ICE + operation_result& r (add_result ("update")); change_wd (trace, &r.log, rwd / main_pkg_conf); @@ -3766,8 +3764,7 @@ build (size_t argc, const char* argv[]) if (has_internal_tests || has_runtime_tests || has_buildtime_tests) { - operation_result* pr (&add_result ("test")); - operation_result& r (*pr); // @@ TMP: Apple Clang 14.0.3 ICE + operation_result& r (add_result ("test")); // Run internal tests. // @@ -3894,8 +3891,7 @@ build (size_t argc, const char* argv[]) // if (install_root) { - operation_result* pr (&add_result ("install")); - operation_result& r (*pr); // @@ TMP: Apple Clang 14.0.3 ICE + operation_result& r (add_result ("install")); change_wd (trace, &r.log, effective_install_conf); @@ -4029,8 +4025,7 @@ build (size_t argc, const char* argv[]) if (bindist) { - operation_result* pr (&add_result ("bindist")); - operation_result& r (*pr); // @@ TMP: Apple Clang 14.0.3 ICE + operation_result& r (add_result ("bindist")); // Fail if the breakpoint refers to a bpkg.bindist.* step but this // step differs from the enabled one. @@ -4342,8 +4337,7 @@ build (size_t argc, const char* argv[]) // if (sys_install) { - operation_result* pr (&add_result ("sys-install")); - operation_result& r (*pr); // @@ TMP: Apple Clang 14.0.3 ICE + operation_result& r (add_result ("sys-install")); // Fail if the breakpoint refers to the bbot.sys-install step since // it has no specific command associated. @@ -4667,8 +4661,7 @@ build (size_t argc, const char* argv[]) if (has_internal_tests || has_runtime_tests || has_buildtime_tests) { - operation_result* pr (&add_result ("test-installed")); - operation_result& r (*pr); // @@ TMP: Apple Clang 14.0.3 ICE + operation_result& r (add_result ("test-installed")); change_wd (trace, &r.log, rwd); @@ -5463,8 +5456,7 @@ build (size_t argc, const char* argv[]) (*bindist == step_id::bpkg_bindist_debian || *bindist == step_id::bpkg_bindist_fedora)) { - operation_result* pr (&add_result ("sys-uninstall")); - operation_result& r (*pr); // @@ TMP: Apple Clang 14.0.3 ICE + operation_result& r (add_result ("sys-uninstall")); // Noop, just for the log record. // @@ -5585,8 +5577,7 @@ build (size_t argc, const char* argv[]) // if (install_root) { - operation_result* pr (&add_result ("uninstall")); - operation_result& r (*pr); // @@ TMP: Apple Clang 14.0.3 ICE + operation_result& r (add_result ("uninstall")); change_wd (trace, &r.log, effective_install_conf); @@ -5644,8 +5635,7 @@ build (size_t argc, const char* argv[]) if (bindist_upload) { - operation_result* pr (&add_result ("upload")); - operation_result& r (*pr); // @@ TMP: Apple Clang 14.0.3 ICE + operation_result& r (add_result ("upload")); change_wd (trace, &r.log, rwd); |