diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-12-13 17:01:55 +0100 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-12-14 10:53:56 +0100 |
| commit | 5e99a8eca8ef8955dac0d2c76fb0e96b9802b4e8 (patch) | |
| tree | 234528935ed030729bf31d2272468cf9085fbd57 /src/buildtool/graph_traverser/graph_traverser.hpp | |
| parent | 3fb25cdc64ca77c75e0835f3bbd8965980d6ac70 (diff) | |
| download | justbuild-5e99a8eca8ef8955dac0d2c76fb0e96b9802b4e8.tar.gz | |
graph_traverser: Forward repo_config via make_optional
... to support building with older GNU libstc++ versions.
Diffstat (limited to 'src/buildtool/graph_traverser/graph_traverser.hpp')
| -rw-r--r-- | src/buildtool/graph_traverser/graph_traverser.hpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/buildtool/graph_traverser/graph_traverser.hpp b/src/buildtool/graph_traverser/graph_traverser.hpp index 82e9f17a..205bac32 100644 --- a/src/buildtool/graph_traverser/graph_traverser.hpp +++ b/src/buildtool/graph_traverser/graph_traverser.hpp @@ -73,9 +73,10 @@ class GraphTraverser { gsl::not_null<RepositoryConfig*> const& repo_config) : clargs_{std::move(clargs)}, repo_config_{repo_config}, - local_api_{CreateExecutionApi(std::nullopt, repo_config)}, + local_api_{CreateExecutionApi(std::nullopt, + std::make_optional(repo_config))}, remote_api_{CreateExecutionApi(RemoteExecutionConfig::RemoteAddress(), - repo_config)}, + std::make_optional(repo_config))}, reporter_{[](auto done, auto cv) {}} {} explicit GraphTraverser(CommandLineArguments clargs, @@ -83,9 +84,10 @@ class GraphTraverser { progress_reporter_t reporter) : clargs_{std::move(clargs)}, repo_config_{repo_config}, - local_api_{CreateExecutionApi(std::nullopt, repo_config)}, + local_api_{CreateExecutionApi(std::nullopt, + std::make_optional(repo_config))}, remote_api_{CreateExecutionApi(RemoteExecutionConfig::RemoteAddress(), - repo_config)}, + std::make_optional(repo_config))}, reporter_{std::move(reporter)} {} /// \brief Parses actions and blobs into graph, traverses it and retrieves @@ -371,8 +373,9 @@ class GraphTraverser { DependencyGraph const& g, std::vector<ArtifactIdentifier> const& artifact_ids) const -> bool { // setup rebuilder with api for cache endpoint - auto api_cached = CreateExecutionApi( - RemoteExecutionConfig::CacheAddress(), repo_config_); + auto api_cached = + CreateExecutionApi(RemoteExecutionConfig::CacheAddress(), + std::make_optional(repo_config_)); Rebuilder executor{repo_config_, &(*local_api_), &(*remote_api_), |