- if(d->get_component()==component && d->get_tool())
- depend_tools.insert(d->get_tool());
-
- for(const Tool *t: depend_tools)
- sigs.push_back(t->create_build_signature(binfo));
- sigs.sort();
- sigs.push_front(tool->create_build_signature(binfo));
+ if(const Tool *t = d->get_tool())
+ if(d->get_component()==component && !any_equals(seen_tools, t))
+ {
+ seen_tools.push_back(t);
+ tool_sigs.push_back(t->create_build_signature(binfo));
+ }
+
+ sort(tool_sigs);
+ sigs.insert(sigs.end(), make_move_iterator(tool_sigs.begin()), make_move_iterator(tool_sigs.end()));