Merge pull request #1209 from hannobraun/rustc

Remove need to specify `crate-type` in `Cargo.toml`
hannobraun · Oct 12, 2022 · 986cf86 · 986cf86
2 parents 05b4ad8 + 2a9caa4
commit 986cf86
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 14 deletions.
diff --git a/crates/fj-host/src/lib.rs b/crates/fj-host/src/lib.rs
@@ -90,8 +90,9 @@ impl Model {
         let mut command_root = Command::new("cargo");
 
         let command = command_root
-            .arg("build")
-            .args(["--manifest-path", &manifest_path]);
+            .arg("rustc")
+            .args(["--manifest-path", &manifest_path])
+            .args(["--crate-type", "cdylib"]);
 
         let cargo_output = command.output()?;
         let exit_status = cargo_output.status;

diff --git a/models/cuboid/Cargo.toml b/models/cuboid/Cargo.toml
@@ -3,8 +3,5 @@ name = "cuboid"
 version = "0.1.0"
 edition = "2021"
 
-[lib]
-crate-type = ["cdylib"]
-
 [dependencies.fj]
 path = "../../crates/fj"
diff --git a/models/spacer/Cargo.toml b/models/spacer/Cargo.toml
@@ -3,8 +3,5 @@ name = "spacer"
 version = "0.1.0"
 edition = "2021"
 
-[lib]
-crate-type = ["cdylib"]
-
 [dependencies.fj]
 path = "../../crates/fj"
diff --git a/models/star/Cargo.toml b/models/star/Cargo.toml
@@ -3,8 +3,5 @@ name = "star"
 version = "0.1.0"
 edition = "2021"
 
-[lib]
-crate-type = ["cdylib"]
-
 [dependencies.fj]
 path = "../../crates/fj"
diff --git a/models/test/Cargo.toml b/models/test/Cargo.toml
@@ -7,8 +7,5 @@ homepage = "https://www.fornjot.app/"
 repository = "https://github.com/hannobraun/fornjot"
 license = "0BSD"
 
-[lib]
-crate-type = ["cdylib"]
-
 [dependencies.fj]
 path = "../../crates/fj"