Better encapsulation of config inside Package

[builder.git] / source / compile.cpp

diff --git a/source/compile.cpp b/source/compile.cpp
index fd802bbb54e76d2a960ae140e40003a174aa03a4..02ae493ea1892a4002c320a88d4ab9997ade1634 100644 (file)
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -17,17 +17,19 @@ 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("g++");
+               argv.push_back(prefix+"g++");
        }
        else
        {
                tool="CC";
-               argv.push_back("gcc");
+               argv.push_back(prefix+"gcc");
        }
        argv.push_back("-c");