---

yaml
---
r: 147591
b: refs/heads/try2
c: 79d97ca
h: refs/heads/master
i:
  147589: 5d1b6ca
  147587: aba38ba
  147583: a99a75c
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: af1184030bfaf73b280a83ddfa469a4e678728c9
+refs/heads/try2: 79d97ca4aad2add186526d7f5b5d87a473fa3f4a
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/back/link.rs

@@ -1089,7 +1089,9 @@ fn link_args(sess: Session,
     // Finally add all the linker arguments provided on the command line along
     // with any #[link_args] attributes found inside the crate
     args.push_all(sess.opts.linker_args);
-    for arg in sess.cstore.get_used_link_args().iter() {
+    let used_link_args = sess.cstore.get_used_link_args();
+    let used_link_args = used_link_args.borrow();
+    for arg in used_link_args.get().iter() {
         args.push(arg.clone());
     }
     return args;

branches/try2/src/librustc/metadata/cstore.rs

@@ -65,7 +65,7 @@ pub struct CStore {
     priv extern_mod_crate_map: RefCell<extern_mod_crate_map>,
     priv used_crate_sources: RefCell<~[CrateSource]>,
     priv used_libraries: RefCell<~[(~str, NativeLibaryKind)]>,
-    priv used_link_args: ~[~str],
+    priv used_link_args: RefCell<~[~str]>,
     intr: @ident_interner
 }
 
@@ -79,7 +79,7 @@ impl CStore {
             extern_mod_crate_map: RefCell::new(HashMap::new()),
             used_crate_sources: RefCell::new(~[]),
             used_libraries: RefCell::new(~[]),
-            used_link_args: ~[],
+            used_link_args: RefCell::new(~[]),
             intr: intr
         }
     }
@@ -151,13 +151,14 @@ impl CStore {
     }
 
     pub fn add_used_link_args(&mut self, args: &str) {
+        let mut used_link_args = self.used_link_args.borrow_mut();
         for s in args.split(' ') {
-            self.used_link_args.push(s.to_owned());
+            used_link_args.get().push(s.to_owned());
         }
     }
 
-    pub fn get_used_link_args<'a>(&'a self) -> &'a [~str] {
-        self.used_link_args.as_slice()
+    pub fn get_used_link_args<'a>(&'a self) -> &'a RefCell<~[~str]> {
+        &self.used_link_args
     }
 
     pub fn add_extern_mod_stmt_cnum(&mut self,