X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=9836e5c52448bc7f8fd3149905cf3a039f0a1b03;hb=bc85cc286c8a3f1055f1979a7ff8697cf1b61912;hp=92475869235ea98d8139151f83d7145eb31297d5;hpb=217889f81407de43d8de469ad93e05b7d334ae0c;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index 9247586..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" && 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)); }