queue.erase(queue.begin());
const StringList &libpath=c->get_build_info().libpath;
- const string &arch=c->get_package().get_arch();
const list<string> &libs=c->get_build_info().libs;
for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
{
- Target *lib=builder.get_library(*i, arch, libpath, libmode);
+ Target *lib=builder.get_library(*i, libpath, libmode);
if(lib)
{
dep_libs.push_back(lib);
*/
string Executable::generate_target_name(const Component &c)
{
+ const SourcePackage &pkg=c.get_package();
string prefix, suffix;
- const string &arch=c.get_package().get_arch();
+ const string &arch=pkg.get_builder().get_current_arch().get_name();
if(c.get_type()==Component::LIBRARY)
{
suffix=".exe";
}
- return (c.get_package().get_out_dir()/(prefix+c.get_name()+suffix)).str();
+ return (pkg.get_out_dir()/(prefix+c.get_name()+suffix)).str();
}