diff options
author | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2016-02-19 14:55:09 +0900 |
---|---|---|
committer | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2016-02-19 14:55:09 +0900 |
commit | 0325b162edd8fc9a6bbc6c6e53cb2c91dd797cbd (patch) | |
tree | 63da777092aa7990292d26abc752375611563fb6 /dep.cc | |
parent | a5ac4d969efdae60ba329f4229ef4c10f9c0836e (diff) | |
download | android_build_kati-0325b162edd8fc9a6bbc6c6e53cb2c91dd797cbd.tar.gz android_build_kati-0325b162edd8fc9a6bbc6c6e53cb2c91dd797cbd.tar.bz2 android_build_kati-0325b162edd8fc9a6bbc6c6e53cb2c91dd797cbd.zip |
[C++] Remove Rule::is_default_target
Diffstat (limited to 'dep.cc')
-rw-r--r-- | dep.cc | 6 |
1 files changed, 1 insertions, 5 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 { |