[C++] Stop restoring environment variables with --ninja_suffix

Also remove --lunch in m2n. They were mainly for my development
and are not necessary anymore. .kati_env causes an error
message for mmm build in Android repo.

1 files changed, 0 insertions, 2 deletions

diff --git a/main.cc b/main.cc
index ff0a8aa..5388e8a 100644
--- a/main.cc
+++ b/main.cc
@@ -103,8 +103,6 @@ static void ParseCommandLine(int argc, char* argv[],
       g_dump_kati_stamp = true;
     } else if (!strcmp(arg, "--detect_android_echo")) {
       g_detect_android_echo = true;
-    } else if (!strcmp(arg, "--error_on_env_change")) {
-      g_error_on_env_change = true;
     } else if (ParseCommandLineOptionWithArg(
         "-j", argv, &i, &num_jobs_str)) {
       g_num_jobs = strtol(num_jobs_str, NULL, 10);