From Craig Silverstein and Ian Lance Taylor: Process --script option.

1 files changed, 6 insertions, 1 deletions

diff --git a/gold/main.cc b/gold/main.cc
index eda586bc673..a4dcc5a42a5 100644
--- a/gold/main.cc
+++ b/gold/main.cc
@@ -54,6 +54,10 @@ main(int argc, char** argv)
 
   Errors errors(program_name);
 
+  // Initialize the global parameters, to let random code get to the
+  // errors object.
+  initialize_parameters(&errors);
+
   // Handle the command line options.
   Command_line command_line;
   command_line.process(argc - 1, argv + 1);
@@ -62,7 +66,8 @@ main(int argc, char** argv)
   if (command_line.options().print_stats())
     start_time = get_run_time();
 
-  initialize_parameters(&command_line.options(), &errors);
+  // Store some options in the globally accessible parameters.
+  set_parameters_from_options(&command_line.options());
 
   // The work queue.
   Workqueue workqueue(command_line.options());