commit: 5d7123c19965b4fee3ce79687cc15f251e998307 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu Aug 8 14:36:52 2024 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu Aug 8 14:36:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d7123c1
cargo.eclass: Fix cargo_target_dir helper following recent changes We used to only set the Rust target when cross-compiling, but now we do it unconditionally, which changes the target directory. Closes: https://bugs.gentoo.org/937574 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> eclass/cargo.eclass | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass index 6d4cf1b425eb..3a63e5027250 100644 --- a/eclass/cargo.eclass +++ b/eclass/cargo.eclass @@ -324,9 +324,7 @@ _cargo_gen_git_config() { # Return the directory within target that contains the build, e.g. # target/aarch64-unknown-linux-gnu/release. cargo_target_dir() { - local abi - tc-is-cross-compiler && abi=/$(rust_abi) - echo "${CARGO_TARGET_DIR:-target}${abi}/$(usex debug debug release)" + echo "${CARGO_TARGET_DIR:-target}/$(rust_abi)/$(usex debug debug release)" } # @FUNCTION: cargo_src_unpack
