summaryrefslogtreecommitdiff
path: root/src/buildtool/build_engine/target_map/target_map.cpp
diff options
context:
space:
mode:
authorMaksim Denisov <denisov.maksim@huawei.com>2024-06-11 13:19:38 +0200
committerMaksim Denisov <denisov.maksim@huawei.com>2024-06-18 12:05:10 +0200
commit60a056f0b01515ad70ff99d08dd3d2b7475c6c37 (patch)
tree4fd4de8710e29582f6843e32c703f5451717d572 /src/buildtool/build_engine/target_map/target_map.cpp
parent26fdbae5f7269c06f95d3d087e657bb192b909d1 (diff)
downloadjustbuild-60a056f0b01515ad70ff99d08dd3d2b7475c6c37.tar.gz
Pass ServeApi as a field of context to the analysis
...instead of using singleton calls.
Diffstat (limited to 'src/buildtool/build_engine/target_map/target_map.cpp')
-rw-r--r--src/buildtool/build_engine/target_map/target_map.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/buildtool/build_engine/target_map/target_map.cpp b/src/buildtool/build_engine/target_map/target_map.cpp
index 0170f3f5..8df7abbf 100644
--- a/src/buildtool/build_engine/target_map/target_map.cpp
+++ b/src/buildtool/build_engine/target_map/target_map.cpp
@@ -1905,7 +1905,7 @@ auto CreateTargetMap(
else if (context->repo_config
->TargetRoot(key.target.ToModule().repository)
->IsAbsent()) {
- if (not RemoteServeConfig::Instance().RemoteAddress()) {
+ if (not context->serve) {
(*logger)(
fmt::format("Root for target {} is absent, but no serve "
"endpoint was configured. Please provide "
@@ -1914,7 +1914,7 @@ auto CreateTargetMap(
/*is_fatal=*/true);
return;
}
- if (not ServeApi::Instance().CheckServeRemoteExecution()) {
+ if (not(*context->serve)->CheckServeRemoteExecution()) {
(*logger)(
"Inconsistent remote execution endpoint and serve endpoint"
"configuration detected.",