Add basic support for tools (not configurable yet)

[builder.git] / source / compile.cpp

diff --git a/source/compile.cpp b/source/compile.cpp
index 02ae493ea1892a4002c320a88d4ab9997ade1634..5162da67f6b683104141bbb891d68ad55bc18653 100644 (file)
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -17,20 +17,14 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
        const TargetList &deps=obj.get_depends();
        Path::Path spath=deps.front()->get_name();
 
-       const string &prefix=b.get_arch_prefix(obj.get_package()->get_arch());
-
        string ext=Path::splitext(spath.str()).ext;
        const char *tool=0;
        if(ext==".cpp" || ext==".cc")
-       {
                tool="CXX";
-               argv.push_back(prefix+"g++");
-       }
        else
-       {
                tool="CC";
-               argv.push_back(prefix+"gcc");
-       }
+
+       argv.push_back(builder.get_tool(tool, obj.get_package()->get_arch()));
        argv.push_back("-c");
        
        const BuildInfo &binfo=comp.get_build_info();