diff options
author | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2015-10-03 11:24:39 +0900 |
---|---|---|
committer | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2015-10-03 11:24:39 +0900 |
commit | af2b7c676c38a3a265bd1a52a97d3c3793c8f707 (patch) | |
tree | 46b7fc6223d408317b570dd2da7193dbd05e67a7 /dep.cc | |
parent | 675ecf36bf43f8743705af7d12dbc3d315462a06 (diff) | |
download | android_build_kati-af2b7c676c38a3a265bd1a52a97d3c3793c8f707.tar.gz android_build_kati-af2b7c676c38a3a265bd1a52a97d3c3793c8f707.tar.bz2 android_build_kati-af2b7c676c38a3a265bd1a52a97d3c3793c8f707.zip |
[C++] Always set is_default_target
Diffstat (limited to 'dep.cc')
-rw-r--r-- | dep.cc | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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<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; |