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 94acd45f8099f907f5650f1d1e19428be38a0c07..92475869235ea98d8139151f83d7145eb31297d5 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -77,7 +77,7 @@ 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));
@@ -263,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);