Combine the gnu and clang toolchains into SystemToolchain

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index e453a84eb73e178c4633799a59afc34810568933..9836e5c52448bc7f8fd3149905cf3a039f0a1b03 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -13,13 +13,12 @@
 #include "binarypackage.h"
 #include "builder.h"
 #include "builtintools.h"
-#include "clangtools.h"
 #include "datatool.h"
-#include "gnutools.h"
 #include "installedfile.h"
 #include "package.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
+#include "systemtools.h"
 #include "task.h"
 #include "virtualtarget.h"
 
@@ -77,12 +76,9 @@ void Builder::set_temp_directory(const FS::Path &p)
 
 void Builder::add_default_tools()
 {
-       bool use_clang = (current_arch->get_system()=="darwin" || current_arch->get_system()=="freebsd");
-       if(use_clang && 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 SystemTools(*this, *current_arch));
        toolchain.add_toolchain(new BuiltinTools(*this));
        toolchain.add_tool(new DataTool(*this));
 }