Revert "[C++] Introduce .KATI_DEPFILE target specific variable"

This reverts commit bee26c1a805c45cdbf2372e17a09766ecd02579f.

1 files changed, 7 insertions, 25 deletions

diff --git a/ninja.cc b/ninja.cc
index a783a7b..c638267 100644
--- a/ninja.cc
+++ b/ninja.cc
@@ -169,13 +169,8 @@ bool GetDepfileFromCommand(string* cmd, string* out) {
 class NinjaGenerator {
  public:
   NinjaGenerator(Evaluator* ev, double start_time)
-      : ce_(ev),
-        ev_(ev),
-        fp_(NULL),
-        rule_id_(0),
-        start_time_(start_time),
-        default_target_(NULL),
-        depfile_var_name_(Intern(".KATI_DEPFILE")) {
+      : ce_(ev), ev_(ev), fp_(NULL), rule_id_(0), start_time_(start_time),
+        default_target_(NULL) {
     ev_->set_avoid_io(true);
     shell_ = ev->EvalVar(kShellSym);
     if (g_flags.goma_dir)
@@ -408,24 +403,12 @@ class NinjaGenerator {
             g_flags.goma_dir) && !use_gomacc;
   }
 
-  bool GetDepfile(DepNode* node, string* cmd_buf, string* depfile) {
-    if (node->rule_vars) {
-      Var* depfile_var = node->rule_vars->Lookup(depfile_var_name_);
-      if (depfile_var->IsDefined()) {
-        depfile_var->Eval(ev_, depfile);
-        return true;
-      }
-    }
-
+  void EmitDepfile(string* cmd_buf) {
     *cmd_buf += ' ';
-    bool result = GetDepfileFromCommand(cmd_buf, depfile);
-    cmd_buf->resize(cmd_buf->size()-1);
-    return result;
-  }
-
-  void EmitDepfile(DepNode* node, string* cmd_buf) {
     string depfile;
-    if (!GetDepfile(node, cmd_buf, &depfile))
+    bool result = GetDepfileFromCommand(cmd_buf, &depfile);
+    cmd_buf->resize(cmd_buf->size()-1);
+    if (!result)
       return;
     fprintf(fp_, " depfile = %s\n", depfile.c_str());
     fprintf(fp_, " deps = gcc\n");
@@ -459,7 +442,7 @@ class NinjaGenerator {
       string cmd_buf;
       use_local_pool |= GenShellScript(commands, &cmd_buf, &description);
       fprintf(fp_, " description = %s\n", description.c_str());
-      EmitDepfile(node, &cmd_buf);
+      EmitDepfile(&cmd_buf);
 
       // It seems Linux is OK with ~130kB and Mac's limit is ~250kB.
       // TODO: Find this number automatically.
@@ -784,7 +767,6 @@ class NinjaGenerator {
   string kati_binary_;
   double start_time_;
   DepNode* default_target_;
-  Symbol depfile_var_name_;
 };
 
 void GenerateNinja(const vector<DepNode*>& nodes,