diff options
author | 2016-11-02 14:46:19 +0000 | |
---|---|---|
committer | 2016-11-02 15:57:22 +0000 | |
commit | 3c365e102b8cc46b04ff9a2792ae14001b5240d3 (patch) | |
tree | 1741bff518948c59c1dcbdddd60145ca658e9043 /src/main/cpp | |
parent | 03b5b57cf2620a618974109829182a01e97605c9 (diff) |
Description redacted.
--
MOS_MIGRATED_REVID=137944374
Diffstat (limited to 'src/main/cpp')
-rw-r--r-- | src/main/cpp/blaze.cc | 6 | ||||
-rw-r--r-- | src/main/cpp/startup_options.cc | 5 | ||||
-rw-r--r-- | src/main/cpp/startup_options.h | 7 |
3 files changed, 0 insertions, 18 deletions
diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc index 47011dc9e0..26053f62bb 100644 --- a/src/main/cpp/blaze.cc +++ b/src/main/cpp/blaze.cc @@ -1490,12 +1490,6 @@ int Main(int argc, const char *argv[], OptionProcessor *option_processor) { CheckBinaryPath(argv[0]); ParseOptions(argc, argv); - string error; - blaze_exit_code::ExitCode reexec_options_exit_code = - globals->options->CheckForReExecuteOptions(argc, argv, &error); - if (reexec_options_exit_code != blaze_exit_code::SUCCESS) { - die(reexec_options_exit_code, "%s", error.c_str()); - } CheckEnvironment(); CreateSecureOutputRoot(); diff --git a/src/main/cpp/startup_options.cc b/src/main/cpp/startup_options.cc index 6efecccba6..20c2eb96ef 100644 --- a/src/main/cpp/startup_options.cc +++ b/src/main/cpp/startup_options.cc @@ -299,11 +299,6 @@ blaze_exit_code::ExitCode StartupOptions::ProcessArgExtra( return blaze_exit_code::SUCCESS; } -blaze_exit_code::ExitCode StartupOptions::CheckForReExecuteOptions( - int argc, const char *argv[], string *error) { - return blaze_exit_code::SUCCESS; -} - string StartupOptions::GetDefaultHostJavabase() const { return blaze::GetDefaultHostJavabase(); } diff --git a/src/main/cpp/startup_options.h b/src/main/cpp/startup_options.h index 3a90b501c4..db9bfb254a 100644 --- a/src/main/cpp/startup_options.h +++ b/src/main/cpp/startup_options.h @@ -65,13 +65,6 @@ class StartupOptions { // StartupOptions, the "ExtraOptions" concept makes no sense; remove it. virtual void AddExtraOptions(std::vector<std::string> *result) const; - // Checks if Blaze needs to be re-executed. Does not return, if so. - // - // Returns the exit code after the check. "error" will contain a descriptive - // string for any return value other than blaze_exit_code::SUCCESS. - virtual blaze_exit_code::ExitCode CheckForReExecuteOptions( - int argc, const char *argv[], std::string *error); - // Checks extra fields when processing arg. // // Returns the exit code after processing the argument. "error" will contain |