Pass -lfoo to linker rather than -l foo.

Author: comex

src/librustc_codegen_llvm/back/linker.rs

@@ -159,6 +159,15 @@ impl<'a> GccLinker<'a> {
         self
     }
 
+    fn add_lib<S>(&mut self, lib: S) -> &mut Self
+        where S: AsRef<OsStr>
+    {
+        let mut os = OsString::from("-l");
+        os.push(lib.as_ref());
+        self.cmd.arg(os);
+        self
+    }
+
     fn takes_hints(&self) -> bool {
         !self.sess.target.target.options.is_like_osx
     }
@@ -185,8 +194,8 @@ impl<'a> GccLinker<'a> {
 }
 
 impl<'a> Linker for GccLinker<'a> {
-    fn link_dylib(&mut self, lib: &str) { self.hint_dynamic(); self.cmd.arg("-l").arg(lib); }
-    fn link_staticlib(&mut self, lib: &str) { self.hint_static(); self.cmd.arg("-l").arg(lib); }
+    fn link_dylib(&mut self, lib: &str) { self.hint_dynamic(); self.add_lib(lib); }
+    fn link_staticlib(&mut self, lib: &str) { self.hint_static(); self.add_lib(lib); }
     fn link_rlib(&mut self, lib: &Path) { self.hint_static(); self.cmd.arg(lib); }
     fn include_path(&mut self, path: &Path) { self.cmd.arg("-L").arg(path); }
     fn framework_path(&mut self, path: &Path) { self.cmd.arg("-F").arg(path); }
@@ -202,7 +211,7 @@ impl<'a> Linker for GccLinker<'a> {
 
     fn link_rust_dylib(&mut self, lib: &str, _path: &Path) {
         self.hint_dynamic();
-        self.cmd.arg("-l").arg(lib);
+        self.add_lib(lib);
     }
 
     fn link_framework(&mut self, framework: &str) {
@@ -238,7 +247,7 @@ impl<'a> Linker for GccLinker<'a> {
             v.push(lib);
             self.linker_arg(&v);
         } else {
-            self.linker_arg("--whole-archive").cmd.arg(lib);
+            self.linker_arg("--whole-archive").add_lib(lib);
             self.linker_arg("--no-whole-archive");
         }
     }