X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=6eeaa2fa3ca3b39e05298b3bd780ff5401cccbaa;hb=878f5e0572a561c1fc342228970889a192d06256;hp=94acd45f8099f907f5650f1d1e19428be38a0c07;hpb=cee450d7cc932811b0d119a132bc9981eb480584;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index 94acd45..6eeaa2f 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -7,19 +7,18 @@
 #include <msp/io/file.h>
 #include <msp/io/print.h>
 #include <msp/strings/format.h>
-#include <msp/time/units.h>
+#include <msp/time/timedelta.h>
 #include <msp/time/utils.h>
 #include "androidtools.h"
 #include "binarypackage.h"
 #include "builder.h"
 #include "builtintools.h"
-#include "clangtools.h"
 #include "datatool.h"
-#include "gnutools.h"
 #include "installedfile.h"
 #include "package.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
+#include "systemtools.h"
 #include "task.h"
 #include "virtualtarget.h"
 
@@ -77,11 +76,9 @@ void Builder::set_temp_directory(const FS::Path &p)
 
 void Builder::add_default_tools()
 {
-	if(current_arch->get_system()=="darwin")
-		toolchain.add_toolchain(new ClangTools(*this, *current_arch));
 	if(current_arch->get_system()=="android")
 		toolchain.add_toolchain(new AndroidTools(*this, *current_arch));
-	toolchain.add_toolchain(new GnuTools(*this, *current_arch));
+	toolchain.add_toolchain(new SystemTools(*this, *current_arch));
 	toolchain.add_toolchain(new BuiltinTools(*this));
 	toolchain.add_tool(new DataTool(*this));
 }
@@ -263,7 +260,7 @@ int Builder::clean(bool all, bool dry_run)
 	while(!queue.empty())
 	{
 		Target *tgt = queue.front();
-		queue.erase(queue.begin());
+		queue.pop_front();
 
 		if(tgt->is_buildable() && (tgt->get_package()==&package_manager.get_main_package() || all))
 			clean_tgts.insert(tgt);