X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=c2f4386a917b28a242868b53071b3084e3d00646;hb=0480f9ab0bcbe630f4a62c9b7ef7981443f9973f;hp=fa6fd5670a5e1cf56251224e7aaf7b80279f02ed;hpb=02097e6a1ddbffbc2217005c3c2ebba528f5248f;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index fa6fd56..c2f4386 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -340,7 +340,8 @@ void Component::Loader::build_info() 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)