blob: da7148e34e36060e9e86c4aaa32de14b354346c1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
From 1fe93707dbb6d9c5214250f576151cb5cec3762f Mon Sep 17 00:00:00 2001
Message-ID: <1fe93707dbb6d9c5214250f576151cb5cec3762f.1776707419.git.sam@gentoo.org>
In-Reply-To: <0f7b6cf83c868a009c9843522429ba6810990ae6.1776707419.git.sam@gentoo.org>
References: <0f7b6cf83c868a009c9843522429ba6810990ae6.1776707419.git.sam@gentoo.org>
From: Sam James <sam@gentoo.org>
Date: Tue, 18 Nov 2025 18:10:47 +0000
Subject: [PATCH 2/2] rust: respect $CARGO environment variable
Respect the CARGO environment variable if set. Gentoo uses this to
control the version of rust/cargo for a build.
Signed-off-by: Sam James <sam@gentoo.org>
---
src/cargo-meson.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cargo-meson.sh b/src/cargo-meson.sh
index 26a6d3bb16..b7b9578861 100755
--- a/src/cargo-meson.sh
+++ b/src/cargo-meson.sh
@@ -31,7 +31,7 @@ case "$(cargo -vV | sed -n 's/^host: \(.*\)$/\1/p')" in
LIBNAME=libgitcore.a;;
esac
-cargo build --lib --manifest-path="$SOURCE_DIR/Cargo.toml" --target-dir="$BUILD_DIR" "$@"
+${CARGO:-cargo} build --lib --manifest-path="$SOURCE_DIR/Cargo.toml" --target-dir="$BUILD_DIR" "$@"
RET=$?
if test $RET -ne 0
then
--
2.53.0
|
