Add paths to beginning when merging BuildInfo

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index cf49f41663e71b45d16dd16bc2a73d0ff5915449..3945b73333a4c6cb1d6995950c5a9197e48b2e0c 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -12,6 +12,7 @@
 #include "binarypackage.h"
 #include "builder.h"
 #include "builtintools.h"
+#include "clangtools.h"
 #include "datatool.h"
 #include "gnutools.h"
 #include "installedfile.h"
@@ -75,6 +76,8 @@ 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));
        toolchain.add_toolchain(new GnuTools(*this, *current_arch));
        toolchain.add_toolchain(new BuiltinTools(*this));
        toolchain.add_tool(new DataTool(*this));
@@ -252,7 +255,7 @@ int Builder::clean(bool all, bool dry_run)
 
        set<Target *> clean_tgts;
        list<Target *> queue;
-       queue.push_back(build_graph.get_target("cmdline"));
+       queue.push_back(&build_graph.get_goals());
 
        while(!queue.empty())
        {