From 4ebb3bf82551c334d16f4935c751fb554224e19c Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Thu, 27 Jun 2024 16:16:09 +0200 Subject: Pass Storage to RepositoryConfig ...and adjust AnalyseContext. --- src/buildtool/build_engine/target_map/export.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/buildtool/build_engine/target_map/export.cpp') diff --git a/src/buildtool/build_engine/target_map/export.cpp b/src/buildtool/build_engine/target_map/export.cpp index 2d92bed6..23ffe641 100644 --- a/src/buildtool/build_engine/target_map/export.cpp +++ b/src/buildtool/build_engine/target_map/export.cpp @@ -129,16 +129,17 @@ void ExportRule( } context->statistics->IncrementExportsFoundCounter(); auto const& target_name = key.target.GetNamedTarget(); - auto repo_key = context->repo_config->RepositoryKey(target_name.repository); + auto repo_key = context->repo_config->RepositoryKey(*context->storage, + target_name.repository); auto target_cache_key = repo_key - ? context->target_cache->ComputeKey( + ? context->storage->TargetCache().ComputeKey( *repo_key, target_name, effective_config) : std::nullopt; if (target_cache_key) { // first try to get value from local target cache auto target_cache_value = - context->target_cache->Read(*target_cache_key); + context->storage->TargetCache().Read(*target_cache_key); bool from_just_serve{false}; #ifndef BOOTSTRAP_BUILD_TOOL -- cgit v1.2.3