Merge pull request #231 from FaultyRAM/fix-non-delimited-lib-names

Fix non-delimited library names

gcc-test/build.rs

@@ -15,13 +15,13 @@ fn main() {
         .flag_if_supported("-Wfoo-bar-this-flag-does-not-exist")
         .define("FOO", None)
         .define("BAR", "1")
-        .compile("libfoo.a");
+        .compile("foo");
 
     gcc::Build::new()
         .file("src/bar1.c")
         .file("src/bar2.c")
         .include("src/include")
-        .compile("libbar.a");
+        .compile("bar");
 
     let target = std::env::var("TARGET").unwrap();
     let file = target.split("-").next().unwrap();
@@ -30,17 +30,17 @@ fn main() {
                        if target.contains("msvc") { "asm" } else { "S" });
     gcc::Build::new()
         .file(file)
-        .compile("libasm.a");
+        .compile("asm");
 
     gcc::Build::new()
         .file("src/baz.cpp")
         .cpp(true)
-        .compile("libbaz.a");
+        .compile("baz");
 
     if target.contains("windows") {
         gcc::Build::new()
             .file("src/windows.c")
-            .compile("libwindows.a");
+            .compile("windows");
     }
 
     // Test that the `windows_registry` module will set PATH by looking for
@@ -84,7 +84,7 @@ fn main() {
     gcc::Build::new()
         .cargo_metadata(false)
         .file("src/opt_linkage.c")
-        .compile("libOptLinkage.a");
+        .compile("OptLinkage");
 
     let out = gcc::Build::new()
         .file("src/expand.c")

src/lib.rs

@@ -689,10 +689,14 @@ impl Build {
     ///
     /// This will return a result instead of panicing; see compile() for the complete description.
     pub fn try_compile(&self, output: &str) -> Result<(), Error> {
-        let lib_name = if output.starts_with("lib") && output.ends_with(".a") {
-                &output[3..output.len() - 2]
+        let (lib_name, gnu_lib_name) = if output.starts_with("lib") && output.ends_with(".a") {
+                (&output[3..output.len() - 2], output.to_owned())
             } else {
-                &output
+                let mut gnu = String::with_capacity(5 + output.len());
+                gnu.push_str("lib");
+                gnu.push_str(&output);
+                gnu.push_str(".a");
+                (output, gnu)
             };
         let dst = self.get_out_dir()?;
 
@@ -715,7 +719,7 @@ impl Build {
             objects.push(obj);
         }
         self.compile_objects(&src_dst)?;
-        self.assemble(lib_name, &dst.join(output), &objects)?;
+        self.assemble(lib_name, &dst.join(gnu_lib_name), &objects)?;
 
         if self.get_target()?.contains("msvc") {
             let compiler = self.get_base_compiler()?;
@@ -734,8 +738,7 @@ impl Build {
             }
         }
 
-        self.print(&format!("cargo:rustc-link-lib=static={}",
-                            &output[3..output.len() - 2]));
+        self.print(&format!("cargo:rustc-link-lib=static={}", lib_name));
         self.print(&format!("cargo:rustc-link-search=native={}", dst.display()));
 
         // Add specific C++ libraries, if enabled.

tests/test.rs

@@ -10,7 +10,7 @@ fn gnu_smoke() {
     let test = Test::gnu();
     test.gcc()
         .file("foo.c")
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0)
         .must_have("-O2")
@@ -28,7 +28,7 @@ fn gnu_opt_level_1() {
     test.gcc()
         .opt_level(1)
         .file("foo.c")
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0)
         .must_have("-O1")
@@ -41,7 +41,7 @@ fn gnu_opt_level_s() {
     test.gcc()
         .opt_level_str("s")
         .file("foo.c")
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0)
         .must_have("-Os")
@@ -57,7 +57,7 @@ fn gnu_debug() {
     test.gcc()
         .debug(true)
         .file("foo.c")
-        .compile("libfoo.a");
+        .compile("foo");
     test.cmd(0).must_have("-g");
 }
 
@@ -67,7 +67,7 @@ fn gnu_warnings_into_errors() {
     test.gcc()
         .warnings_into_errors(true)
         .file("foo.c")
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0).must_have("-Werror");
 }
@@ -78,7 +78,7 @@ fn gnu_warnings() {
     test.gcc()
         .warnings(true)
         .file("foo.c")
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0).must_have("-Wall")
                .must_have("-Wextra");
@@ -93,7 +93,7 @@ fn gnu_x86_64() {
             .target(&target)
             .host(&target)
             .file("foo.c")
-            .compile("libfoo.a");
+            .compile("foo");
 
         test.cmd(0)
             .must_have("-fPIC")
@@ -111,7 +111,7 @@ fn gnu_x86_64_no_pic() {
             .target(&target)
             .host(&target)
             .file("foo.c")
-            .compile("libfoo.a");
+            .compile("foo");
 
         test.cmd(0).must_not_have("-fPIC");
     }
@@ -126,7 +126,7 @@ fn gnu_i686() {
             .target(&target)
             .host(&target)
             .file("foo.c")
-            .compile("libfoo.a");
+            .compile("foo");
 
         test.cmd(0)
             .must_have("-m32");
@@ -143,7 +143,7 @@ fn gnu_i686_pic() {
             .target(&target)
             .host(&target)
             .file("foo.c")
-            .compile("libfoo.a");
+            .compile("foo");
 
         test.cmd(0).must_have("-fPIC");
     }
@@ -155,7 +155,7 @@ fn gnu_set_stdlib() {
     test.gcc()
         .cpp_set_stdlib(Some("foo"))
         .file("foo.c")
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0).must_not_have("-stdlib=foo");
 }
@@ -166,7 +166,7 @@ fn gnu_include() {
     test.gcc()
         .include("foo/bar")
         .file("foo.c")
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0).must_have("-I").must_have("foo/bar");
 }
@@ -178,7 +178,7 @@ fn gnu_define() {
         .define("FOO", "bar")
         .define("BAR", None)
         .file("foo.c")
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0).must_have("-DFOO=bar").must_have("-DBAR");
 }
@@ -188,7 +188,7 @@ fn gnu_compile_assembly() {
     let test = Test::gnu();
     test.gcc()
         .file("foo.S")
-        .compile("libfoo.a");
+        .compile("foo");
     test.cmd(0).must_have("foo.S");
 }
 
@@ -199,7 +199,7 @@ fn gnu_shared() {
         .file("foo.c")
         .shared_flag(true)
         .static_flag(false)
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0)
         .must_have("-shared")
@@ -216,7 +216,7 @@ fn gnu_flag_if_supported() {
         .file("foo.c")
         .flag_if_supported("-Wall")
         .flag_if_supported("-Wflag-does-not-exist")
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0)
         .must_have("-Wall")
@@ -230,7 +230,7 @@ fn gnu_static() {
         .file("foo.c")
         .shared_flag(false)
         .static_flag(true)
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0)
         .must_have("-static")
@@ -242,7 +242,7 @@ fn msvc_smoke() {
     let test = Test::msvc();
     test.gcc()
         .file("foo.c")
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0)
         .must_have("/O2")
@@ -259,7 +259,7 @@ fn msvc_opt_level_0() {
     test.gcc()
         .opt_level(0)
         .file("foo.c")
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0).must_not_have("/O2");
 }
@@ -270,7 +270,7 @@ fn msvc_debug() {
     test.gcc()
         .debug(true)
         .file("foo.c")
-        .compile("libfoo.a");
+        .compile("foo");
     test.cmd(0).must_have("/Z7");
 }
 
@@ -280,7 +280,7 @@ fn msvc_include() {
     test.gcc()
         .include("foo/bar")
         .file("foo.c")
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0).must_have("/I").must_have("foo/bar");
 }
@@ -292,7 +292,7 @@ fn msvc_define() {
         .define("FOO", "bar")
         .define("BAR", None)
         .file("foo.c")
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0).must_have("/DFOO=bar").must_have("/DBAR");
 }
@@ -303,7 +303,7 @@ fn msvc_static_crt() {
     test.gcc()
         .static_crt(true)
         .file("foo.c")
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0).must_have("/MT");
 }
@@ -314,7 +314,7 @@ fn msvc_no_static_crt() {
     test.gcc()
         .static_crt(false)
         .file("foo.c")
-        .compile("libfoo.a");
+        .compile("foo");
 
     test.cmd(0).must_have("/MD");
 }