X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcompile.cpp;h=61b17ad90807c65b0c85c649fbabe7c31a5cc6cc;hb=0ac8d6708b8c758fb89d97a0049d4a329990b83b;hp=d07f3ef4ee3255cbef1d1299a72c13dffad8db00;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git diff --git a/source/compile.cpp b/source/compile.cpp index d07f3ef..61b17ad 100644 --- a/source/compile.cpp +++ b/source/compile.cpp @@ -31,9 +31,9 @@ Compile::Compile(Builder &b, const ObjectFile &obj): else tool="CC"; - argv.push_back(builder.get_tool(tool, comp.get_package().get_arch())); + argv.push_back(builder.get_architecture(comp.get_package().get_arch()).get_tool(tool)); argv.push_back("-c"); - + const BuildInfo &binfo=comp.get_build_info(); for(list::const_iterator i=binfo.cflags.begin(); i!=binfo.cflags.end(); ++i) argv.push_back(*i); @@ -41,7 +41,7 @@ Compile::Compile(Builder &b, const ObjectFile &obj): argv.push_back("-I"+*i); for(list::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i) argv.push_back("-D"+*i); - + Path::Path opath=obj.get_name(); argv.push_back("-o"); argv.push_back(opath.str());