From afb554e5a69efdf4db3ee3f72e00be47bf1c67f9 Mon Sep 17 00:00:00 2001 From: Brendan Molloy Date: Thu, 11 Apr 2024 12:21:33 +0200 Subject: [PATCH] Derp --- CHANGELOG.md | 4 ++++ Cargo.lock | 2 +- Cargo.toml | 2 +- src/cargo.rs | 5 ++++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e29038..6f1a70f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## Changelog +### v3.5.2 - 2024-04-11 + +- Fix: make `CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER` correct + ### v3.5.1 - 2024-04-11 - Fix: make the exports from `ndk-env` use underscores diff --git a/Cargo.lock b/Cargo.lock index 789b393..a474fa2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,7 +25,7 @@ dependencies = [ [[package]] name = "cargo-ndk" -version = "3.5.1" +version = "3.5.2" dependencies = [ "anyhow", "cargo_metadata", diff --git a/Cargo.toml b/Cargo.toml index c26868c..ef07d1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-ndk" -version = "3.5.1" +version = "3.5.2" authors = ["Brendan Molloy "] repository = "https://github.com/bbqsrc/cargo-ndk" documentation = "https://docs.rs/cargo-ndk" diff --git a/src/cargo.rs b/src/cargo.rs index ef61b33..ec1bd1b 100644 --- a/src/cargo.rs +++ b/src/cargo.rs @@ -75,7 +75,10 @@ pub(crate) fn build_env( bindgen: bool, ) -> BTreeMap { let self_path = std::fs::canonicalize(env::args().next().unwrap()) - .expect("Failed to canonicalize absolute path to cargo-ndk"); + .expect("Failed to canonicalize absolute path to cargo-ndk") + .parent() + .unwrap() + .join("cargo-ndk"); // Environment variables for the `cc` crate let (cc_key, _cc_value) = cc_env("CC", triple);