Add gcc's private library directory to ClangLinker's system path

[builder.git] / source / virtualtarget.cpp

diff --git a/source/virtualtarget.cpp b/source/virtualtarget.cpp
index e44eecc5828b99b4e230d4c3c29692fdafedc112..07177d86057387ad4feefc2dfcdfca885a81b1e0 100644 (file)
--- a/source/virtualtarget.cpp
+++ b/source/virtualtarget.cpp
@@ -1,16 +1,22 @@
-#include <msp/path/utils.h>
+#include <msp/core/algorithm.h>
+#include <msp/fs/path.h>
+#include <msp/fs/utils.h>
+#include "builder.h"
 #include "virtualtarget.h"
 
 using namespace std;
+using namespace Msp;
 
 void VirtualTarget::check_rebuild()
 {
-       for(list<Target *>::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
-               if((*i)->get_rebuild())
-                       mark_rebuild(Msp::Path::basename((*i)->get_name())+" needs rebuilding");
+       // Virtual targets are only rebuilt if their dependencies need rebuilding.
+       auto i = find_if(depends, [](Target *d){ return d->needs_rebuild(); });
+       if(i!=depends.end())
+               mark_rebuild((*i)->get_name()+" needs rebuilding");
 }
 
-unsigned VirtualTarget::count_rebuild()
+Task *VirtualTarget::build()
 {
-       return Target::count_rebuild()-rebuild;
+       state = UPTODATE;
+       return 0;
 }