Update rust staticlib gen to 0.2.2 (git) + fix macos

Lupus · Nov 11, 2024 · af841a0 · af841a0
1 parent 64b24b2
commit af841a0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,3 +32,7 @@ members = [
 
 [patch.crates-io]
 ocaml-rs-smartptr = { git = "https://github.com/Lupus/ocaml-rs-smartptr.git" }
+
+# See https://github.com/dtolnay/linkme/issues/61
+[profile.dev]
+lto = "thin"
diff --git a/rust-async.opam b/rust-async.opam
@@ -40,4 +40,7 @@ build: [
 x-rust-stubs-crate: "ocaml-lwt-interop"
 pin-depends: [
   ["ocaml-rs-smartptr.0.1.0" "git+https://github.com/Lupus/ocaml-rs-smartptr.git"]
+  ["rust-staticlib-gen.0.2.2" "git+https://github.com/Lupus/rust-staticlib-gen.git#0.2.2"]
+  ["rust-staticlib-virtual.0.2.2" "git+https://github.com/Lupus/rust-staticlib-gen.git#0.2.2"]
+  ["dune-cargo-build.0.2.2" "git+https://github.com/Lupus/rust-staticlib-gen.git#0.2.2"]
 ]
diff --git a/rust-async.opam.template b/rust-async.opam.template
@@ -5,4 +5,7 @@
 x-rust-stubs-crate: "ocaml-lwt-interop"
 pin-depends: [
   ["ocaml-rs-smartptr.0.1.0" "git+https://github.com/Lupus/ocaml-rs-smartptr.git"]
+  ["rust-staticlib-gen.0.2.2" "git+https://github.com/Lupus/rust-staticlib-gen.git#0.2.2"]
+  ["rust-staticlib-virtual.0.2.2" "git+https://github.com/Lupus/rust-staticlib-gen.git#0.2.2"]
+  ["dune-cargo-build.0.2.2" "git+https://github.com/Lupus/rust-staticlib-gen.git#0.2.2"]
 ]
diff --git a/rust-staticlib/dune.inc b/rust-staticlib/dune.inc
@@ -81,7 +81,9 @@
 ; see https://github.com/rust-lang/cargo/issues/6790
 
 (rule
- (targets librust_staticlib_rust_async.a dllrust_staticlib_rust_async.so)
+ (targets
+  "librust_staticlib_rust_async%{ocaml-config:ext_lib}"
+  "dllrust_staticlib_rust_async%{ocaml-config:ext_dll}")
  (deps
   (alias rust-universe) ; rebuild only if Rust bits change, linking is slow
   Cargo.toml)