v0.9.3

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["konstin <[email protected]>"]
 name = "maturin"
-version = "0.9.3"
+version = "0.9.4"
 description = "Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages"
 exclude = ["test-crates/**/*", "sysconfig/*", "test-data/*", "ci/*", "tests/*"]
 readme = "Readme.md"

Changelog.md

@@ -12,6 +12,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  * Rename `classifier` to `classifiers` for pypi compatibility. The old `classifier` is still available and now also works with pypi 
  * Fix building for musl by automatically setting `-C target-feature=-crt-static` 
 
+## 0.9.4
+
+* Fix building a bin with musl 
+
+## 0.9.3
+
+* CI failure
+
+## 0.9.2
+
+* CI failure
+
 ## 0.9.1 - 2021-01-13
 
  * Error when the `abi3` feature is selected but no minimum version

src/compile.rs

@@ -97,15 +97,6 @@ fn compile_target(
 ) -> Result<HashMap<String, PathBuf>> {
     let mut shared_args = vec!["--manifest-path", context.manifest_path.to_str().unwrap()];
 
-    // We need to pass --bins / --lib to set the rustc extra args later
-    // TODO: What do we do when there are multiple bin targets?
-    match bindings_crate {
-        BridgeModel::Bin => shared_args.push("--bins"),
-        BridgeModel::Cffi | BridgeModel::Bindings(_) | BridgeModel::BindingsAbi3(_, _) => {
-            shared_args.push("--lib")
-        }
-    }
-
     shared_args.extend(context.cargo_extra_args.iter().map(String::as_str));
 
     if context.release {
@@ -116,14 +107,26 @@ fn compile_target(
         shared_args.push(target);
     }
 
-    let cargo_args = vec!["rustc", "--message-format", "json"];
-
     let mut rustc_args: Vec<&str> = context
         .rustc_extra_args
         .iter()
         .map(String::as_str)
         .collect();
 
+    // We need to pass --bins / --lib to set the rustc extra args later
+    // TODO: What do we do when there are multiple bin targets?
+    match bindings_crate {
+        BridgeModel::Bin => shared_args.push("--bins"),
+        BridgeModel::Cffi | BridgeModel::Bindings(_) | BridgeModel::BindingsAbi3(_, _) => {
+            shared_args.push("--lib");
+            // https://github.com/rust-lang/rust/issues/59302#issue-422994250
+            // We must only do this for libraries as it breaks binaries
+            if context.target.is_musl_target() {
+                rustc_args.extend(&["-C", "target-feature=-crt-static"]);
+            }
+        }
+    }
+
     // https://github.com/PyO3/pyo3/issues/88#issuecomment-337744403
     if context.target.is_macos() {
         if let BridgeModel::Bindings(_) | BridgeModel::BindingsAbi3(_, _) = bindings_crate {
@@ -153,9 +156,7 @@ fn compile_target(
         }
     }
 
-    if context.target.is_musl_target() {
-        rustc_args.extend(&["-C", "target-feature=-crt-static"]);
-    }
+    let cargo_args = vec!["rustc", "--message-format", "json"];
 
     let build_args: Vec<_> = cargo_args
         .iter()

src/source_distribution.rs

@@ -95,7 +95,6 @@ pub fn source_distribution(
     ));
     writer.add_directory(&root_dir)?;
     for (target, source) in target_source {
-        println!("{} {}", target.display(), source.display());
         writer.add_file(root_dir.join(target), source)?;
     }