diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 4 | ||||
-rw-r--r-- | android-rust-env.sh | 18 |
3 files changed, 13 insertions, 13 deletions
@@ -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 @@ -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 \ |