summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2024-04-12 16:03:03 +0200
committerKlaus Aehlig <klaus.aehlig@huawei.com>2024-04-12 18:09:38 +0200
commit989cde7dc99e4ce789b1520cd622a8049d6b85f9 (patch)
tree580958e270519c2d1a153955653795da9a501226 /src
parente7458ab863ea9b1b2e6a9b874e5fdd1dd7262c22 (diff)
downloadjustbuild-989cde7dc99e4ce789b1520cd622a8049d6b85f9.tar.gz
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.
Diffstat (limited to 'src')
-rw-r--r--src/buildtool/build_engine/target_map/target_map.cpp2
1 files changed, 1 insertions, 1 deletions
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