summaryrefslogtreecommitdiff
path: root/src/buildtool/main/main.cpp
diff options
context:
space:
mode:
authorMaksim Denisov <denisov.maksim@huawei.com>2024-06-17 11:28:47 +0200
committerMaksim Denisov <denisov.maksim@huawei.com>2024-07-05 12:58:35 +0200
commitc88585ddf9386fb14154a4f3baa702569d55584a (patch)
tree05461204866831ab88364981390dae474f16247d /src/buildtool/main/main.cpp
parent8c73c618d777a07c017ec0deefe88db83652827e (diff)
downloadjustbuild-c88585ddf9386fb14154a4f3baa702569d55584a.tar.gz
Use StorageConfig functionality via Instance()
...to track changes during refactoring easier.
Diffstat (limited to 'src/buildtool/main/main.cpp')
-rw-r--r--src/buildtool/main/main.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp
index 0e72890a..2b3add04 100644
--- a/src/buildtool/main/main.cpp
+++ b/src/buildtool/main/main.cpp
@@ -110,7 +110,7 @@ void SetupExecutionConfig(EndpointArguments const& eargs,
using LocalConfig = LocalExecutionConfig;
using RemoteConfig = RemoteExecutionConfig;
if (not(not eargs.local_root or
- (StorageConfig::SetBuildRoot(*eargs.local_root))) or
+ (StorageConfig::Instance().SetBuildRoot(*eargs.local_root))) or
not(not bargs.local_launcher or
LocalConfig::SetLauncher(*bargs.local_launcher))) {
Logger::Log(LogLevel::Error, "Failed to configure local execution.");
@@ -881,10 +881,11 @@ auto main(int argc, char* argv[]) -> int {
ProgressReporter::Reporter(&stats, &progress)};
if (arguments.cmd == SubCommand::kInstallCas) {
- if (not repo_config.SetGitCAS(StorageConfig::GitRoot())) {
+ if (not repo_config.SetGitCAS(
+ StorageConfig::Instance().GitRoot())) {
Logger::Log(LogLevel::Debug,
"Failed set Git CAS {}.",
- StorageConfig::GitRoot().string());
+ StorageConfig::Instance().GitRoot().string());
}
return FetchAndInstallArtifacts(main_apis, arguments.fetch)
? kExitSuccess