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 3945b73333a4c6cb1d6995950c5a9197e48b2e0c..92475869235ea98d8139151f83d7145eb31297d5 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -9,6 +9,7 @@
 #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 "builtintools.h"
@@ -76,8 +77,10 @@ void Builder::set_temp_directory(const FS::Path &p)
 
 void Builder::add_default_tools()
 {
-       if(current_arch->get_system()=="darwin")
+       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));
@@ -260,7 +263,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);