-#include <msp/strings/format.h>
#include "booleanevaluator.h"
#include "builder.h"
#include "conditionalloader.h"
void ArchitectureConditional::if_arch(const string &cond)
{
const Architecture &arch = builder.get_current_arch();
- BooleanEvaluator eval([&arch](const string &value, const string *){ return arch.match_name(value); }, false);
+ BooleanEvaluator eval([&arch](const string &value){ return arch.match_name(value); });
bool match = eval.evaluate(cond);
- builder.get_logger().log("configure", format("%s: arch %s %smatched", log_prefix, cond, (match ? "" : "not ")));
+ builder.get_logger().log("configure", "%s: arch %s %smatched", log_prefix, cond, (match ? "" : "not "));
if(match)
load_sub_with(*this);
}
{
BooleanEvaluator eval([this](const string &feat, const string *value){ return package.match_feature(feat, value); });
bool match = eval.evaluate(cond);
- package.get_builder().get_logger().log("configure", format("%s: feature %s %smatched", log_prefix, cond, (match ? "" : "not ")));
+ package.get_builder().get_logger().log("configure", "%s: feature %s %smatched", log_prefix, cond, (match ? "" : "not "));
if(match)
load_sub_with(*this);
}