From 989cde7dc99e4ce789b1520cd622a8049d6b85f9 Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Fri, 12 Apr 2024 16:03:03 +0200 Subject: Target analysis: report short names of targets when describing a conflict Configured targets, by design, cannot distinguish between a value not occuring in the configuration and occuring there with value null. Therefore, to understand the conflict, we can as well drop all the null values of the target configuration when reporting it. --- src/buildtool/build_engine/target_map/target_map.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/buildtool/build_engine/target_map/target_map.cpp b/src/buildtool/build_engine/target_map/target_map.cpp index 3a3dd5ee..1d169c05 100644 --- a/src/buildtool/build_engine/target_map/target_map.cpp +++ b/src/buildtool/build_engine/target_map/target_map.cpp @@ -226,7 +226,7 @@ auto NameTransitionedDeps( auto conf = effective_conf.Update(transitioned_target.config.Expr()) .Prune(analysis->Vars()); return BuildMaps::Target::ConfiguredTarget{transitioned_target.target, conf} - .ToString(); + .ToShortString(); } // Check if an object is contained an expression; to avoid tree-unfolding -- cgit v1.2.3