summaryrefslogtreecommitdiff
path: root/src/buildtool/build_engine/target_map/target_map.cpp
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2024-10-21 15:47:03 +0200
committerKlaus Aehlig <klaus.aehlig@huawei.com>2024-10-21 16:02:33 +0200
commit01ae2737c6ea663ad4e741f048889950bbfb2510 (patch)
treee5b6bfefa2d387b4553013ea95335581caff4206 /src/buildtool/build_engine/target_map/target_map.cpp
parenteeed3ec02387dcd897c6a84010f1913a093bea07 (diff)
downloadjustbuild-01ae2737c6ea663ad4e741f048889950bbfb2510.tar.gz
configured_target: honor --expression-log-limit when shortening representation
Diffstat (limited to 'src/buildtool/build_engine/target_map/target_map.cpp')
-rw-r--r--src/buildtool/build_engine/target_map/target_map.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/buildtool/build_engine/target_map/target_map.cpp b/src/buildtool/build_engine/target_map/target_map.cpp
index 02aae13b..961cdc73 100644
--- a/src/buildtool/build_engine/target_map/target_map.cpp
+++ b/src/buildtool/build_engine/target_map/target_map.cpp
@@ -233,7 +233,7 @@ auto NameTransitionedDeps(
auto conf = effective_conf.Update(transitioned_target.config.Expr())
.Prune(analysis->Vars());
return BuildMaps::Target::ConfiguredTarget{transitioned_target.target, conf}
- .ToShortString();
+ .ToShortString(Evaluator::GetExpressionLogLimit());
}
// Check if an object is contained an expression; to avoid tree-unfolding
@@ -1511,10 +1511,12 @@ void withTargetsFile(
std::make_shared<AsyncMapConsumerLogger>(
[logger, key, rn](auto const& msg, auto fatal) {
(*logger)(
- fmt::format("While analysing {} target {}:\n{}",
- rn.ToString(),
- key.ToShortString(),
- msg),
+ fmt::format(
+ "While analysing {} target {}:\n{}",
+ rn.ToString(),
+ key.ToShortString(
+ Evaluator::GetExpressionLogLimit()),
+ msg),
fatal);
}),
result_map);
@@ -1970,7 +1972,8 @@ auto CreateTargetMap(
[logger, key](auto msg, auto fatal) {
(*logger)(
fmt::format("While processing absent target {}:\n{}",
- key.ToShortString(),
+ key.ToShortString(
+ Evaluator::GetExpressionLogLimit()),
msg),
fatal);
});