Older versions of OS X don't have clang

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index b73618f25ae637b36d5b1c96ffca2f55ccd4b0d2..92475869235ea98d8139151f83d7145eb31297d5 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -9,21 +9,17 @@
 #include <msp/strings/format.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
+#include "androidtools.h"
 #include "binarypackage.h"
 #include "builder.h"
-#include "copy.h"
+#include "builtintools.h"
+#include "clangtools.h"
 #include "datatool.h"
-#include "gnuarchiver.h"
-#include "gnuccompiler.h"
-#include "gnucxxcompiler.h"
-#include "gnulinker.h"
+#include "gnutools.h"
 #include "installedfile.h"
-#include "mingwdlltool.h"
 #include "package.h"
-#include "pkgconfiggenerator.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
-#include "tar.h"
 #include "task.h"
 #include "virtualtarget.h"
 
@@ -81,15 +77,12 @@ void Builder::set_temp_directory(const FS::Path &p)
 
 void Builder::add_default_tools()
 {
-       toolchain.add_tool(new GnuCCompiler(*this, *current_arch));
-       toolchain.add_tool(new GnuCxxCompiler(*this, *current_arch));
-       toolchain.add_tool(new GnuLinker(*this, *current_arch));
-       toolchain.add_tool(new GnuArchiver(*this, *current_arch));
-       toolchain.add_tool(new Copy(*this));
-       toolchain.add_tool(new Tar(*this));
-       toolchain.add_tool(new PkgConfigGenerator(*this));
-       if(current_arch->get_system()=="windows")
-               toolchain.add_tool(new MingwDllTool(*this, *current_arch));
+       if(current_arch->get_system()=="darwin" && vfs.find_binary("clang"))
+               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 BuiltinTools(*this));
        toolchain.add_tool(new DataTool(*this));
 }
 
@@ -265,12 +258,12 @@ 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())
        {
                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);