diff options
| author | Evan Martin <martine@danga.com> | 2011-12-09 22:49:30 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2011-12-09 22:49:30 (GMT) |
| commit | 283282d6123a49c50efc6382e8082ced6bf6d268 (patch) | |
| tree | a0e8902d8a705caa41caa6dfa9cf33c998cf9a09 /src | |
| parent | b922101633f3ec5973b7c7de0956bbef09522e4f (diff) | |
| parent | ab8d80f398970419c8fb9f6a67bb86a4251af191 (diff) | |
| download | Ninja-283282d6123a49c50efc6382e8082ced6bf6d268.zip Ninja-283282d6123a49c50efc6382e8082ced6bf6d268.tar.gz Ninja-283282d6123a49c50efc6382e8082ced6bf6d268.tar.bz2 | |
Merge pull request #153 from polrop/fix-bootstrap
Fix bootstrap
Diffstat (limited to 'src')
| -rw-r--r-- | src/ninja.cc | 2 | ||||
| -rw-r--r-- | src/state.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ninja.cc b/src/ninja.cc index 25d5bfa..18b3980 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -565,7 +565,7 @@ reload: if (tool == "clean") return CmdClean(&state, argc+1, argv-1, config); if (tool == "list") - return CmdClean(&state, argc+1, argv-1, config); + return CmdList(&state, argc, argv); const char* suggestion = SpellcheckString(tool, "graph", "query", "browse", "targets", "rules", "commands", "clean", diff --git a/src/state.cc b/src/state.cc index 06adf8b..79e2551 100644 --- a/src/state.cc +++ b/src/state.cc @@ -28,7 +28,7 @@ State::State() : build_log_(NULL) { } void State::AddRule(const Rule* rule) { - assert(LookupRule(rule->name_) == NULL); + assert(LookupRule(rule->name()) == NULL); rules_[rule->name()] = rule; } |