X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbuilder.cpp;h=9836e5c52448bc7f8fd3149905cf3a039f0a1b03;hb=ccc65716b6a5d1a07b66ae427d55745b6807e9e7;hp=3776e36ef169dc09db238d2630a16f051cc17de5;hpb=aeb23448b5035f4ceb662c487913618d0efff888;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index 3776e36..9836e5c 100644 --- 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,11 +76,9 @@ void Builder::set_temp_directory(const FS::Path &p) void Builder::add_default_tools() { - if(current_arch->get_system()=="darwin") - 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)); }