X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=65d7da48c3cd8be5e9e568df17148f12bdc7ceac;hb=c0e0728ff439ddb364cee26f164e46705beac822;hp=3ad6146349fbaf331fa2779e97407e4ff2aa6f6a;hpb=84da3f6c94dbe7e36aaf088890fda5fcf3b3efb0;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index 3ad6146..65d7da4 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -13,12 +13,14 @@
 #include "binarypackage.h"
 #include "builder.h"
 #include "builtintools.h"
+#include "clangtools.h"
 #include "datatool.h"
+#include "gnutools.h"
 #include "installedfile.h"
+#include "microsofttools.h"
 #include "package.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
-#include "systemtools.h"
 #include "task.h"
 #include "virtualtarget.h"
 
@@ -85,9 +87,15 @@ void Builder::set_temp_directory(const FS::Path &p)
 
 void Builder::add_default_tools()
 {
+	const string &arch_tc = current_arch->get_toolchain();
 	if(current_arch->get_system()=="android")
 		toolchain.add_toolchain(new AndroidTools(*this, *current_arch));
-	toolchain.add_toolchain(new SystemTools(*this, *current_arch));
+	else if(arch_tc=="msvc")
+		toolchain.add_toolchain(new MicrosoftTools(*this, *current_arch));
+	else if(arch_tc=="clang")
+		toolchain.add_toolchain(new ClangTools(*this, *current_arch));
+	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));
 }