X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchive.cpp;h=a018dc9235c4421351003565cb4e6a2c1c438af9;hb=0f5283a54fd188072eca23fbd980a43c6c869913;hp=4dee50899f123ad580b5f3f66997527446442fec;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git diff --git a/source/archive.cpp b/source/archive.cpp index 4dee508..a018dc9 100644 --- a/source/archive.cpp +++ b/source/archive.cpp @@ -21,7 +21,8 @@ Archive::Archive(Builder &b, const StaticLibrary &lib): { const Component &comp=lib.get_component(); - argv.push_back(builder.get_tool("AR", comp.get_package().get_arch())); + std::string tool="AR"; + argv.push_back(builder.get_current_arch().get_tool(tool)); argv.push_back("rc"); argv.push_back(lib.get_name()); @@ -30,11 +31,11 @@ Archive::Archive(Builder &b, const StaticLibrary &lib): if(dynamic_cast(*i)) argv.push_back((*i)->get_name()); - Path::Path lpath=lib.get_name(); + Path lpath=lib.get_name(); if(!builder.get_dry_run()) - Path::mkpath(lpath.subpath(0, lpath.size()-1), 0755); + mkpath(lpath.subpath(0, lpath.size()-1), 0755); - announce(comp.get_package().get_name(), "AR ", relative(lpath, comp.get_package().get_source()).str()); + announce(comp.get_package().get_name(), tool, relative(lpath, comp.get_package().get_source()).str()); launch(); }