Pass ServeApi to ServeServerImpl by reference

...instead of using singleton calls.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp
index f4d0f566..0063e9bd 100644
--- a/src/buildtool/main/main.cpp
+++ b/src/buildtool/main/main.cpp
@@ -867,8 +867,14 @@ auto main(int argc, char* argv[]) -> int {
 
         if (arguments.cmd == SubCommand::kServe) {
             SetupServeServiceConfig(arguments.service);
+            std::optional<gsl::not_null<const ServeApi*>> serve;
+            if (RemoteServeConfig::Instance().RemoteAddress()) {
+                serve = &ServeApi::Instance();
+            }
+
             if (!ServeServerImpl::Instance().Run(
                     RemoteServeConfig::Instance(),
+                    serve,
                     !RemoteExecutionConfig::RemoteAddress())) {
                 return kExitFailure;
             }