From af2b7c676c38a3a265bd1a52a97d3c3793c8f707 Mon Sep 17 00:00:00 2001 From: Shinichiro Hamaji Date: Sat, 3 Oct 2015 11:24:39 +0900 Subject: [C++] Always set is_default_target --- dep.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'dep.cc') diff --git a/dep.cc b/dep.cc index f23bbb8..3fa4c98 100644 --- a/dep.cc +++ b/dep.cc @@ -150,8 +150,6 @@ class DepBuilder { } CHECK(!first_rule_->outputs.empty()); - first_rule_->is_default_target = true; - if (targets.empty()) { targets.push_back(first_rule_->outputs[0]); } @@ -293,6 +291,7 @@ 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; } @@ -307,6 +306,7 @@ class DepBuilder { auto p = rules_.insert(make_pair(output, rule)); if (p.second) { if (!first_rule_ && output.get(0) != '.') { + rule->is_default_target = true; first_rule_ = rule; } } else { @@ -394,6 +394,7 @@ 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; @@ -427,6 +428,7 @@ class DepBuilder { shared_ptr r = make_shared(*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; -- cgit v1.2.3