From: Mikko Rasa Date: Sun, 6 Oct 2013 16:26:26 +0000 (+0300) Subject: Missed one location with the conditional conversion X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=f8655608bfdaf8634ad7cc566598a0db3fe557fe;p=builder.git Missed one location with the conditional conversion --- 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)