if(type==LIBRARY || type==MODULE)
if(build_info.libmode<BuildInfo::DYNAMIC)
build_info.libmode = BuildInfo::DYNAMIC;
-
- if(build_info.libmode<BuildInfo::DYNAMIC)
- {
- for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
- {
- const BuildInfo &ebi = (*i)->get_exported_build_info();
- build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
- }
- }
}
BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
void Component::Loader::if_arch(const string &cond)
{
- bool match = obj.package.get_builder().get_current_arch().match_name(cond);
+ BooleanEvaluator eval(sigc::hide<1>(sigc::mem_fun(&obj.package.get_builder().get_current_arch(), &Architecture::match_name)), false);
+ bool match = eval.evaluate(cond);
obj.package.get_builder().get_logger().log("configure",
format("%s/%s: arch %s %smatched", obj.package.get_name(), obj.name, cond, (match ? "" : "not ")));
if(match)