X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsystemtools.cpp;h=77fe2bedb9c2b701ad67f89fc05802de8c2fb1ad;hb=bc85cc286c8a3f1055f1979a7ff8697cf1b61912;hp=bf90cf0cf2041b3024b7c72703194495175645dc;hpb=cea2680b64eb10790f3b88a97bd0a4ed29d8a3b0;p=builder.git

diff --git a/source/systemtools.cpp b/source/systemtools.cpp
index bf90cf0..77fe2be 100644
--- a/source/systemtools.cpp
+++ b/source/systemtools.cpp
@@ -1,13 +1,9 @@
 #include "architecture.h"
 #include "builder.h"
-#include "clangccompiler.h"
-#include "clangcxxcompiler.h"
-#include "clangobjccompiler.h"
+#include "clangcompiler.h"
 #include "gnuarchiver.h"
-#include "gnuccompiler.h"
-#include "gnucxxcompiler.h"
+#include "gnucompiler.h"
 #include "gnulinker.h"
-#include "gnuobjccompiler.h"
 #include "mingwdlltool.h"
 #include "systemtools.h"
 
@@ -18,15 +14,15 @@ SystemTools::SystemTools(Builder &builder, const Architecture &arch)
 	const string &sys = arch.get_system();
 	if((sys=="darwin" || sys=="freebsd") && builder.get_vfs().find_binary("clang"))
 	{
-		add_tool(new ClangCCompiler(builder, arch));
-		add_tool(new ClangCxxCompiler(builder, arch));
-		add_tool(new ClangObjCCompiler(builder, arch));
+		add_tool(new ClangCompiler(builder, arch, "CC"));
+		add_tool(new ClangCompiler(builder, arch, "CXX"));
+		add_tool(new ClangCompiler(builder, arch, "OBJC"));
 	}
 	else
 	{
-		add_tool(new GnuCCompiler(builder, arch));
-		add_tool(new GnuCxxCompiler(builder, arch));
-		add_tool(new GnuObjCCompiler(builder, arch));
+		add_tool(new GnuCompiler(builder, arch, "CC"));
+		add_tool(new GnuCompiler(builder, arch, "CXX"));
+		add_tool(new GnuCompiler(builder, arch, "OBJC"));
 	}
 
 	add_tool(new GnuLinker(builder, arch));