Adapt to changes in msppath

[builder.git] / source / compile.cpp

diff --git a/source/compile.cpp b/source/compile.cpp
index d07f3ef4ee3255cbef1d1299a72c13dffad8db00..44d4d6255fe1c2d57caea506e6d00809d7fce541 100644 (file)
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -22,18 +22,18 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
        const Component &comp=obj.get_component();
 
        const TargetList &deps=obj.get_depends();
-       Path::Path spath=deps.front()->get_name();
+       Path spath=deps.front()->get_name();
 
-       string ext=Path::splitext(spath.str()).ext;
+       string ext=splitext(spath.str()).ext;
        const char *tool=0;
        if(ext==".cpp" || ext==".cc")
                tool="CXX";
        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<string>::const_iterator i=binfo.cflags.begin(); i!=binfo.cflags.end(); ++i)
                argv.push_back(*i);
@@ -41,14 +41,14 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
                argv.push_back("-I"+*i);
        for(list<string>::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
                argv.push_back("-D"+*i);
-       
-       Path::Path opath=obj.get_name();
+
+       Path opath=obj.get_name();
        argv.push_back("-o");
        argv.push_back(opath.str());
        argv.push_back(spath.str());
 
        if(!builder.get_dry_run())
-               Path::mkpath(opath.subpath(0, opath.size()-1), 0755);
+               mkpath(opath.subpath(0, opath.size()-1), 0755);
 
        announce(comp.get_package().get_name(), tool, relative(opath, comp.get_package().get_source()).str());