diff --git a/Makefile b/Makefile index 33472e86a..1db54dffb 100644 --- a/Makefile +++ b/Makefile @@ -602,11 +602,11 @@ test_merkle_tree_go_bindings_linux_old: build_merkle_tree_linux_old __MINA_FFI__: ## build_mina_macos: @cd operator/mina/lib && cargo build --release ${MINA_FEATURES_FLAG} - @cp operator/mina/lib/target/release/libmina_state_verifier_ffi.dylib operator/mina/lib/libmina_state_verifier.dylib + @cp operator/mina/lib/target/release/libmina_state_verifier_ffi.dylib operator/mina/lib/libmina_state_verifier_ffi.dylib build_mina_linux: @cd operator/mina/lib && cargo build --release ${MINA_FEATURES_FLAG} - @cp operator/mina/lib/target/release/libmina_state_verifier_ffi.so operator/mina/lib/libmina_state_verifier.so + @cp operator/mina/lib/target/release/libmina_state_verifier_ffi.so operator/mina/lib/libmina_state_verifier_ffi.so test_mina_rust_ffi: @echo "Testing Mina Rust FFI source code..." @@ -623,11 +623,11 @@ test_mina_go_bindings_linux: build_mina_linux __MINA_ACCOUNT_FFI__: ## build_mina_account_macos: @cd operator/mina_account/lib && cargo build --release - @cp operator/mina_account/lib/target/release/libmina_account_verifier_ffi.dylib operator/mina_account/lib/libmina_account_verifier.dylib + @cp operator/mina_account/lib/target/release/libmina_account_verifier_ffi.dylib operator/mina_account/lib/libmina_account_verifier_ffi.dylib build_mina_account_linux: @cd operator/mina_account/lib && cargo build --release - @cp operator/mina_account/lib/target/release/libmina_account_verifier_ffi.so operator/mina_account/lib/libmina_account_verifier.so + @cp operator/mina_account/lib/target/release/libmina_account_verifier_ffi.so operator/mina_account/lib/libmina_account_verifier_ffi.so test_mina_account_rust_ffi: @echo "Testing Mina Account Rust FFI source code..." diff --git a/operator/mina/.gitignore b/operator/mina/.gitignore index 50ce50103..572110790 100644 --- a/operator/mina/.gitignore +++ b/operator/mina/.gitignore @@ -1,3 +1,3 @@ -lib/libmina_state_verifier.so -lib/libmina_state_verifier.a -lib/libmina_state_verifier.dylib +lib/libmina_state_verifier_ffi.so +lib/libmina_state_verifier_ffi.a +lib/libmina_state_verifier_ffi.dylib diff --git a/operator/mina/mina.go b/operator/mina/mina.go index 538884564..e95728eeb 100644 --- a/operator/mina/mina.go +++ b/operator/mina/mina.go @@ -1,8 +1,8 @@ package mina /* -#cgo darwin LDFLAGS: -L./lib -lmina_state_verifier -#cgo linux LDFLAGS: ${SRCDIR}/lib/libmina_state_verifier.so -ldl -lrt -lm -lssl -lcrypto -Wl,--allow-multiple-definition +#cgo darwin LDFLAGS: -L./lib -lmina_state_verifier_ffi +#cgo linux LDFLAGS: ${SRCDIR}/lib/libmina_state_verifier_ffi.so -ldl -lrt -lm -lssl -lcrypto -Wl,--allow-multiple-definition #include "lib/mina_verifier.h" */ diff --git a/operator/mina_account/mina_account.go b/operator/mina_account/mina_account.go index c541cd58d..aa7459243 100644 --- a/operator/mina_account/mina_account.go +++ b/operator/mina_account/mina_account.go @@ -1,8 +1,8 @@ package mina_account /* -#cgo darwin LDFLAGS: -L./lib -lmina_account_verifier -#cgo linux LDFLAGS: ${SRCDIR}/lib/libmina_account_verifier.so -ldl -lrt -lm -lssl -lcrypto -Wl,--allow-multiple-definition +#cgo darwin LDFLAGS: -L./lib -lmina_account_verifier_ffi +#cgo linux LDFLAGS: ${SRCDIR}/lib/libmina_account_verifier_ffi.so -ldl -lrt -lm -lssl -lcrypto -Wl,--allow-multiple-definition #include "lib/mina_account_verifier.h" */