summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Exequiel Pedone2024-04-20 07:54:06 -0300
committerGonzalo Exequiel Pedone2024-04-20 07:54:06 -0300
commit2882293669a32f667cce931e190b9096cbfd1063 (patch)
tree48b750a29bb867e71bd77b0f9989f1fa5912d687
parentc895af84a3b746ed068e80c7ad3e14d7a57c1f7d (diff)
downloadaur-android-rust.tar.gz
CARGO_BUILD_TARGET -> RUST_TARGET.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--android-rust-env.sh18
3 files changed, 13 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eb4d4d03ddf4..117a0031bcda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = android-rust
pkgdesc = Script providing common environment variables and functions for Rust build on Android.
- pkgver = 1
+ pkgver = 2
pkgrel = 1
url = https://aur.archlinux.org/packages/android-rust
arch = any
@@ -9,6 +9,6 @@ pkgbase = android-rust
depends = cargo-c
depends = rustup
source = android-rust-env.sh
- md5sums = 5c46880c932383df93abb6a0520ea3e2
+ md5sums = b4cec673167780158ffd5d586c779529
pkgname = android-rust
diff --git a/PKGBUILD b/PKGBUILD
index ad12e86e233d..6a89610ca731 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Gonzalo Exequiel Pedone <hipersayan DOT x AT gmail DOT com>
pkgname=android-rust
-pkgver=1
+pkgver=2
pkgrel=1
arch=('any')
pkgdesc="Script providing common environment variables and functions for Rust build on Android."
@@ -11,7 +11,7 @@ depends=('android-environment'
'cargo-c'
'rustup')
source=('android-rust-env.sh')
-md5sums=('5c46880c932383df93abb6a0520ea3e2')
+md5sums=('b4cec673167780158ffd5d586c779529')
package() {
install -d ${pkgdir}/usr/bin
diff --git a/android-rust-env.sh b/android-rust-env.sh
index d3be8c4bb4d5..980827813ef2 100644
--- a/android-rust-env.sh
+++ b/android-rust-env.sh
@@ -18,31 +18,31 @@ fi
case "${_android_arch}" in
aarch64)
- export CARGO_BUILD_TARGET=aarch64-linux-android
+ export RUST_TARGET=aarch64-linux-android
;;
armv7a-eabi)
- export CARGO_BUILD_TARGET=armv7-linux-androideabi
+ export RUST_TARGET=armv7-linux-androideabi
;;
x86)
- export CARGO_BUILD_TARGET=i686-linux-android
+ export RUST_TARGET=i686-linux-android
;;
x86-64)
- export CARGO_BUILD_TARGET=x86_64-linux-android
+ export RUST_TARGET=x86_64-linux-android
;;
*)
- export CARGO_BUILD_TARGET=${_android_arch}-linux-android
+ export RUST_TARGET=${_android_arch}-linux-android
;;
esac
export CARGO_HOME="${HOME}/.android-cargo/${_android_arch}/${ANDROID_NDK_PLATFORM}"
android_rust_prepare() {
- rustup target add "${CARGO_BUILD_TARGET}"
+ rustup target add "${RUST_TARGET}"
rustup default "${RUST_CHANNEL}" && rustup update
mkdir -p "${CARGO_HOME}"
cat << EOF > "${CARGO_HOME}/config.toml"
-[target.${CARGO_BUILD_TARGET}]
+[target.${RUST_TARGET}]
ar = "${ANDROID_AR}"
linker = "${ANDROID_CC}"
EOF
@@ -50,7 +50,7 @@ EOF
android_cargo_cbuild() {
cargo cbuild \
- --target "${CARGO_BUILD_TARGET}" \
+ --target "${RUST_TARGET}" \
--prefix="${ANDROID_PREFIX}" \
--release \
--frozen \
@@ -59,7 +59,7 @@ android_cargo_cbuild() {
android_cargo_cinstall() {
cargo cinstall \
- --target "$CARGO_BUILD_TARGET" \
+ --target "$RUST_TARGET" \
--prefix="${ANDROID_PREFIX}" \
--release \
--frozen \