auto merge of #5914 : catamorphism/rust/copy-cops, r=catamorphism

2 files changed, 4 insertions, 4 deletions

diff --git a/src/librustpkg/rustpkg.rc b/src/librustpkg/rustpkg.rc
index 206404ae204..76d145cb2b7 100644
--- a/src/librustpkg/rustpkg.rc
+++ b/src/librustpkg/rustpkg.rc
@@ -76,13 +76,13 @@ impl PkgScript {
         // Build the rustc session data structures to pass
         // to the compiler
         let options = @session::options {
-            binary: binary,
+            binary: @binary,
             crate_type: session::bin_crate,
             .. *session::basic_options()
         };
         let input = driver::file_input(script);
         let sess = driver::build_session(options, diagnostic::emit);
-        let cfg = driver::build_configuration(sess, binary, input);
+        let cfg = driver::build_configuration(sess, @binary, input);
         let (crate, _) = driver::compile_upto(sess, cfg, input,
                                               driver::cu_parse, None);
         let work_dir = dest_dir(id);
diff --git a/src/librustpkg/util.rs b/src/librustpkg/util.rs
index bb162974e03..7581329f1fc 100644
--- a/src/librustpkg/util.rs
+++ b/src/librustpkg/util.rs
@@ -478,7 +478,7 @@ pub fn compile_input(sysroot: Option<Path>,
         test: test,
         maybe_sysroot: sysroot,
         addl_lib_search_paths: ~[copy *out_dir],
-        .. *driver::build_session_options(binary, &matches, diagnostic::emit)
+        .. *driver::build_session_options(@binary, &matches, diagnostic::emit)
     };
     let mut crate_cfg = options.cfg;
 
@@ -518,7 +518,7 @@ pub fn compile_crate_from_input(input: driver::input,
     debug!("Calling build_output_filenames with %?", build_dir_opt);
     let outputs = driver::build_output_filenames(input, &build_dir_opt, &Some(out_file), sess);
     debug!("Outputs are %? and output type = %?", outputs, sess.opts.output_type);
-    let cfg = driver::build_configuration(sess, binary, input);
+    let cfg = driver::build_configuration(sess, @binary, input);
     match crate_opt {
         Some(c) => {
             debug!("Calling compile_rest, outputs = %?", outputs);