holding-cell: Rely less on environment variables

We can use cc::Build::new() to get the compiler and clang-binutils to find objcopy. Signed-off-by: Elliot Berman <[email protected]>
quic · Dec 18, 2024 · 793476d · 793476d
1 parent e712bae
commit 793476d
Show file tree

Hide file tree

Showing 6 changed files with 325 additions and 19 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -7,7 +7,6 @@ linker = "android-ndk/arm64/bin/aarch64-linux-android-clang"
 runner = "runners/adb_runner.sh"
 
 [env]
-CC_aarch64-linux-android = { value = "android-ndk/arm64/bin/aarch64-linux-android-clang", relative = true }
-OBJCOPY = { value = "android-ndk/arm64/bin/llvm-objcopy", relative = true }
-AR_aarch64-linux-android = { value = "android-ndk/arm64/bin/llvm-ar", relative = true }
+CC_aarch64_linux_android = { value = "android-ndk/arm64/bin/aarch64-linux-android-clang", relative = true }
+AR_aarch64_linux_android = { value = "android-ndk/arm64/bin/llvm-ar", relative = true }
 RUST_TEST_THREADS = "1"