about summary refs log tree commit diff
path: root/src/comp/driver
diff options
context:
space:
mode:
authorGraydon Hoare <graydon@mozilla.com>2011-06-16 16:55:46 -0700
committerGraydon Hoare <graydon@mozilla.com>2011-06-16 16:55:46 -0700
commitb84fffaa4e0e672b4653a7832d75a2dc120040aa (patch)
treead8e6854d11f6627b7afc9b8d14f525580beff55 /src/comp/driver
parenteb9969f54699924e4373f6c447aaeb4dd041b0dd (diff)
downloadrust-b84fffaa4e0e672b4653a7832d75a2dc120040aa.tar.gz
rust-b84fffaa4e0e672b4653a7832d75a2dc120040aa.zip
Reformat a bunch of recent churn.
Diffstat (limited to 'src/comp/driver')
-rw-r--r--src/comp/driver/rustc.rs20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
index e0a6d28f2b7..a9e3748e1b5 100644
--- a/src/comp/driver/rustc.rs
+++ b/src/comp/driver/rustc.rs
@@ -239,7 +239,7 @@ fn build_session_options(str binary, getopts::match match) ->
                 case ("3") { 3u }
                 case (_) {
                     log_err "error: optimization level needs " +
-                        "to be between 0-3";
+                                "to be between 0-3";
                     fail
                 }
             }
@@ -399,13 +399,11 @@ fn main(vec[str] args) {
         let str prog = "gcc";
         // The invocations of gcc share some flags across platforms
 
-        let vec[str] common_args = [stage, "-Lrt", "-lrustrt",
-         "-fno-strict-aliasing", "-fPIC", "-Wall",
-         "-fno-rtti", "-fno-exceptions", "-g", glu, "-o",
-         saved_out_filename, saved_out_filename + ".o"];
-
-       auto shared_cmd;
-
+        let vec[str] common_args =
+            [stage, "-Lrt", "-lrustrt", "-fno-strict-aliasing", "-fPIC",
+             "-Wall", "-fno-rtti", "-fno-exceptions", "-g", glu, "-o",
+             saved_out_filename, saved_out_filename + ".o"];
+        auto shared_cmd;
         alt (sess.get_targ_cfg().os) {
             case (session::os_win32) {
                 shared_cmd = "-shared";
@@ -421,12 +419,12 @@ fn main(vec[str] args) {
             }
         }
         if (sopts.shared) {
-           gcc_args += [shared_cmd];
+            gcc_args += [shared_cmd];
         } else {
-           gcc_args += ["-Lrustllvm", "-lrustllvm", "-lstd", "-lm", main];
+            gcc_args += ["-Lrustllvm", "-lrustllvm", "-lstd", "-lm", main];
         }
-
         // We run 'gcc' here
+
         run::run_program(prog, gcc_args);
         // Clean up on Darwin