Add a toolchain field to Architecture

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index b49bc7577909471b81459be1ee13c76e0651d194..7ef1ea1dcfd6d498969647a4cc7fe6f71f669db1 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -86,12 +86,12 @@ void Builder::set_temp_directory(const FS::Path &p)
 
 void Builder::add_default_tools()
 {
-       const string &sys = current_arch->get_system();
-       if(sys=="android")
+       const string &arch_tc = current_arch->get_toolchain();
+       if(current_arch->get_system()=="android")
                toolchain.add_toolchain(new AndroidTools(*this, *current_arch));
-       else if((sys=="darwin" || sys=="freebsd") && vfs.find_binary("clang"))
+       else if(arch_tc=="clang")
                toolchain.add_toolchain(new ClangTools(*this, *current_arch));
-       else
+       else if(arch_tc=="gnu")
                toolchain.add_toolchain(new GnuTools(*this, *current_arch));
        toolchain.add_toolchain(new BuiltinTools(*this));
        toolchain.add_tool(new DataTool(*this));