X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=9006a570cb360f42c00589bd08abc7e54b25ca05;hb=92d81529ec8f3b84f5471162d0b27914eff7adb5;hp=0d8c2da0d81ecc8b5ec3621e4a3a2d2aa86eac19;hpb=df88e22a258f169b9505acb0cb8d0ba7e66af7b6;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index 0d8c2da..9006a57 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -85,6 +85,16 @@ void Target::set_tool(Tool &t)
 		(*i)->set_tool(t);
 }
 
+void Target::collect_build_info(BuildInfo &binfo) const
+{
+	if(tool)
+		binfo.update_from(tool->get_build_info());
+	if(component)
+		binfo.update_from(component->get_build_info());
+	else if(package)
+		binfo.update_from(package->get_build_info());
+}
+
 void Target::force_rebuild()
 {
 	if(!is_buildable())
@@ -111,6 +121,7 @@ void Target::prepare()
 		return;
 	if(state==PREPARING)
 	{
+		builder.get_logger().log("problems", format("Dependency cycle detected at %s", name));
 		problems.push_back("Dependency cycle detected");
 		state = BROKEN;
 		return;
@@ -140,6 +151,8 @@ void Target::prepare()
 		(*i)->prepare();
 		broken |= (*i)->is_broken();
 	}
+	for(Dependencies::iterator i=trans_depends.begin(); i!=trans_depends.end(); ++i)
+		(*i)->prepare();
 
 	check_rebuild();
 	if(broken)