gistfile1.diff

diff --git a/src/ninja.cc b/src/ninja.cc
index 6dc2766..cbe5ddc 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -68,7 +68,9 @@ void Usage(const BuildConfig& config) {
 "             query   show inputs/outputs for a path\n"
 "             targets list targets by their rule or depth in the DAG\n"
 "             rules   list all rules\n"
-"             clean   clean built files\n",
+"             clean   clean built files\n"
+"           NOTE: -t terminates option processing; further command-line\n"
+"           flags are passed to the tool.\n",
           config.parallelism);
 }
 
@@ -402,7 +404,8 @@ int main(int argc, char** argv) {
   };
 
   int opt;
-  while ((opt = getopt_long(argc, argv, "f:hj:k:nt:vC:", kLongOptions,
+  while (tool.empty() &&
+         (opt = getopt_long(argc, argv, "f:hj:k:nt:vC:", kLongOptions,
                             NULL)) != -1) {
     switch (opt) {
       case 'f':