X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffiletarget.cpp;h=6ce5cfdb3bcee336d5b601608c23c8b50b8e2edf;hb=c194bac9d508999c046a1f56c80b9419f77a8590;hp=af63c237a2a0e849b8fe403bb0edb2ed3a772425;hpb=4cc08a580ddcdc025d2ca23c336e76c11414d8e0;p=builder.git

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index af63c23..6ce5cfd 100644
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -70,7 +70,7 @@ void FileTarget::touch()
 
 void FileTarget::check_rebuild()
 {
-	if(!tool)
+	if(!tool || needs_rebuild())
 		return;
 
 	if(!mtime)
@@ -89,12 +89,10 @@ void FileTarget::check_rebuild()
 
 	if(!needs_rebuild())
 	{
+		// Some side effects might not exist
 		for(Dependencies::iterator i=side_effects.begin(); (i!=side_effects.end() && !needs_rebuild()); ++i)
-		{
-			FileTarget *ft = dynamic_cast<FileTarget *>(*i);
-			if(ft && !ft->get_mtime())
-				mark_rebuild((*i)->get_name()+" does not exist");
-		}
+			if((*i)->needs_rebuild())
+				mark_rebuild((*i)->get_name()+" needs rebuilding");
 	}
 
 	if(!needs_rebuild() && package)
@@ -102,11 +100,14 @@ void FileTarget::check_rebuild()
 		if(package->get_config().get_mtime()>mtime)
 			mark_rebuild("Package options changed");
 
-		string build_sig = create_build_signature();
-		if(package->get_cache().has_key(this, "build_sig"))
+		if(tool->get_executable())
 		{
-			if(package->get_cache().get_value(this, "build_sig")!=build_sig)
-				mark_rebuild("Build signature changed");
+			string build_sig = create_build_signature();
+			if(package->get_cache().has_key(this, "build_sig"))
+			{
+				if(package->get_cache().get_value(this, "build_sig")!=build_sig)
+					mark_rebuild("Build signature changed");
+			}
 		}
 	}
 }