diff options
-rw-r--r-- | dep.cc | 6 | ||||
-rw-r--r-- | rule.cc | 5 | ||||
-rw-r--r-- | rule.h | 1 |
3 files changed, 2 insertions, 10 deletions
@@ -350,7 +350,6 @@ class DepBuilder { ApplyOutputPattern(old_rule, output, old_rule.order_only_inputs, &r->order_only_inputs); } - r->is_default_target |= old_rule.is_default_target; return r; } @@ -365,7 +364,6 @@ class DepBuilder { auto p = rules_.emplace(output, rule); if (p.second) { if (!first_rule_.IsValid() && output.get(0) != '.') { - rule->is_default_target = true; first_rule_ = output; } } else { @@ -494,7 +492,6 @@ class DepBuilder { copy(rule->inputs.begin(), rule->inputs.end(), back_inserter(r->inputs)); r->cmds = irule->cmds; - r->is_default_target |= irule->is_default_target; r->loc = irule->loc; r->cmd_lineno = irule->cmd_lineno; *out_rule = r; @@ -526,7 +523,6 @@ class DepBuilder { shared_ptr<Rule> r = make_shared<Rule>(*rule); r->inputs.insert(r->inputs.begin(), input); r->cmds = irule->cmds; - r->is_default_target |= irule->is_default_target; r->loc = irule->loc; r->cmd_lineno = irule->cmd_lineno; *out_rule = r; @@ -620,7 +616,7 @@ class DepBuilder { n->has_rule = true; n->cmds = rule->cmds; - n->is_default_target = rule->is_default_target; + n->is_default_target = first_rule_ == output; if (cur_rule_vars_->empty()) { n->rule_vars = NULL; } else { @@ -50,8 +50,7 @@ bool IsPatternRule(StringPiece s) { Rule::Rule() : is_double_colon(false), is_suffix_rule(false), - cmd_lineno(0), - is_default_target(false) { + cmd_lineno(0) { } void ParseRule(Loc& loc, StringPiece line, char term, @@ -167,8 +166,6 @@ string Rule::DebugString() const { v.push_back("is_double_colon"); if (is_suffix_rule) v.push_back("is_suffix_rule"); - if (is_default_target) - v.push_back("is_default_target"); if (!cmds.empty()) { v.push_back(StringPrintf("cmds=[%s]", JoinValues(cmds, ",").c_str())); } @@ -44,7 +44,6 @@ class Rule { vector<Value*> cmds; Loc loc; int cmd_lineno; - bool is_default_target; private: void Error(const string& msg) { |