Back to individual config.toml

wasm should not use vendor
MinaProtocol · Jan 28, 2025 · c0c0f04 · c0c0f04
1 parent c18a4fc
commit c0c0f04
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 21 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
diff --git a/src/lib/crypto/kimchi_bindings/js/web/dune b/src/lib/crypto/kimchi_bindings/js/web/dune
@@ -23,7 +23,6 @@
   ../../../../../../Cargo.lock
   (source_tree ../../../mina-rust-dependencies)
   (source_tree ../../../proof-systems)
-  (source_tree ../../../../../.cargo)
   ;; Required as we use Cargo workspace, and the build requires the Cargo.toml
   ;; and sources for each members
   ../../stubs/Cargo.toml
@@ -33,6 +32,7 @@
   ../../wasm/Cargo.toml
   ;; Enforcing the rust version used for the build
   ../../wasm/rust-toolchain.toml
+  (source_tree ../../wasm/.cargo)
   (source_tree ../../wasm/src))
  (locks /cargo-lock) ; lock for rustup
  (action

diff --git a/src/lib/crypto/kimchi_bindings/stubs/.cargo/config.toml b/src/lib/crypto/kimchi_bindings/stubs/.cargo/config.toml
@@ -0,0 +1,8 @@
+[target]
+rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"]
+
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "../../../mina-rust-dependencies"
diff --git a/src/lib/crypto/kimchi_bindings/stubs/dune b/src/lib/crypto/kimchi_bindings/stubs/dune
@@ -41,14 +41,13 @@
   ./Cargo.toml
   ../../../../../rust-toolchain.toml
   (source_tree src)
-  (source_tree ../../../../../.cargo)
+  (source_tree .cargo)
   (source_tree ../../mina-rust-dependencies)
   (source_tree ../../proof-systems)
   ;; Required as Cargo asks for all members of the workspace.
   ;; This is temporary until we move into proof-systems
   ../wasm/Cargo.toml
   (source_tree ../wasm/src)
-  (source_tree ../wasm/.cargo)
   (env_var MARLIN_PLONK_STUBS))
  (locks /cargo-lock) ;; lock for rustup
  (action
@@ -159,7 +158,7 @@
   (source_tree ../../mina-rust-dependencies)
   (source_tree ../../proof-systems)
   (source_tree src)
-  (source_tree ../../../../../.cargo)
+  (source_tree .cargo)
   ;; Required as Cargo asks for all members of the workspace.
   ;; This is temporary until we move into proof-systems
   ../wasm/Cargo.toml

diff --git a/src/lib/crypto/kimchi_bindings/wasm/.cargo/config.toml b/src/lib/crypto/kimchi_bindings/wasm/.cargo/config.toml
@@ -0,0 +1,7 @@
+[profile.release.target.wasm32-unknown-unknown]
+debug = true
+
+[package.metadata.wasm-pack.profile.release]
+wasm-opt = false
+#wasm-opt = ["-O4", "--detect-features", "--enable-mutable-globals" ]
+#wasm-opt = ["-O4", "--enable-mutable-globals"]