From bae3c8ec9dafcbe86f25bb7ed461ee6133535804 Mon Sep 17 00:00:00 2001 From: Patrick Goldinger Date: Wed, 18 Sep 2024 18:25:04 +0200 Subject: [PATCH] Fix Rust Cargo.lock file getting rewritten during build (#2568) --- lib/native/build.gradle.kts | 2 +- lib/native/src/main/rust/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/native/build.gradle.kts b/lib/native/build.gradle.kts index 0ccaae40..8a7d573d 100644 --- a/lib/native/build.gradle.kts +++ b/lib/native/build.gradle.kts @@ -68,7 +68,7 @@ android { tasks.named("clean") { doLast { - delete("src/main/rust/target", "src/main/rust/Cargo.lock") + delete("src/main/rust/target") } } diff --git a/lib/native/src/main/rust/CMakeLists.txt b/lib/native/src/main/rust/CMakeLists.txt index 5375b4e4..77bae23a 100644 --- a/lib/native/src/main/rust/CMakeLists.txt +++ b/lib/native/src/main/rust/CMakeLists.txt @@ -45,7 +45,7 @@ add_custom_target( ) add_custom_target( fl_native_rust_build ALL - COMMAND ${CARGO_EXECUTABLE} rustc --release --target ${RUST_TARGET} -- + COMMAND ${CARGO_EXECUTABLE} rustc --release --locked --target ${RUST_TARGET} -- -C linker="${LLVM_TOOLCHAIN}/${ANDROID_TARGET}${CMAKE_ANDROID_API}-clang" DEPENDS setup_rust_target BYPRODUCTS ${FL_NATIVE_RUST_PATH}