From 684cf178ef455ee21a03e2458cdf59afa584498f Mon Sep 17 00:00:00 2001 From: Alberto Sartori Date: Tue, 28 Jun 2022 18:26:06 +0200 Subject: sort and deduplicate outputs before creating the action --- src/buildtool/build_engine/target_map/target_map.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/buildtool/build_engine/target_map/target_map.cpp') diff --git a/src/buildtool/build_engine/target_map/target_map.cpp b/src/buildtool/build_engine/target_map/target_map.cpp index 815f1432..d15c1af4 100644 --- a/src/buildtool/build_engine/target_map/target_map.cpp +++ b/src/buildtool/build_engine/target_map/target_map.cpp @@ -15,6 +15,7 @@ #include "src/buildtool/build_engine/target_map/built_in_rules.hpp" #include "src/buildtool/build_engine/target_map/utils.hpp" #include "src/utils/cpp/path.hpp" +#include "src/utils/cpp/vector.hpp" namespace { @@ -396,8 +397,10 @@ void withDependencies( "either outs or out_dirs must be specified for ACTION"}; } - std::sort(outputs.begin(), outputs.end()); - std::sort(output_dirs.begin(), output_dirs.end()); + sort_and_deduplicate(&outputs); + sort_and_deduplicate(&output_dirs); + + // find entries present on both fields std::vector dups{}; std::set_intersection(outputs.begin(), outputs.end(), -- cgit v1.2.3