sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-package: mv termux_setup_rust to scripts/build/setup

Browse Source
This commit is contained in:
Henrik Grimler 2019-02-26 21:33:42 +01:00 committed by Leonid Pliushch
parent 7eb7ad6617
commit 2bd607112b
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build-package.sh
View File

@ -13,23 +13,7 @@ source scripts/build/termux_download.sh
source scripts/build/setup/termux_setup_golang.sh source scripts/build/setup/termux_setup_golang.sh
# Utility function for rust-using packages to setup a rust toolchain. # Utility function for rust-using packages to setup a rust toolchain.
termux_setup_rust() { source scripts/build/setup/termux_setup_rust.sh
if [ $TERMUX_ARCH = "arm" ]; then
CARGO_TARGET_NAME=armv7-linux-androideabi
else
CARGO_TARGET_NAME=$TERMUX_ARCH-linux-android
fi
local ENV_NAME=CARGO_TARGET_${CARGO_TARGET_NAME^^}_LINKER
ENV_NAME=${ENV_NAME//-/_}
export $ENV_NAME=$CC
curl https://sh.rustup.rs -sSf > $TERMUX_PKG_TMPDIR/rustup.sh
sh $TERMUX_PKG_TMPDIR/rustup.sh -y
export PATH=$HOME/.cargo/bin:$PATH
rustup target add $CARGO_TARGET_NAME
}
# Utility function to setup a current ninja build system. # Utility function to setup a current ninja build system.
termux_setup_ninja() { termux_setup_ninja() {

17
scripts/build/setup/termux_setup_rust.sh Normal file
View File

@ -0,0 +1,17 @@
termux_setup_rust() {
if [ $TERMUX_ARCH = "arm" ]; then
CARGO_TARGET_NAME=armv7-linux-androideabi
else
CARGO_TARGET_NAME=$TERMUX_ARCH-linux-android
fi
local ENV_NAME=CARGO_TARGET_${CARGO_TARGET_NAME^^}_LINKER
ENV_NAME=${ENV_NAME//-/_}
export $ENV_NAME=$CC
curl https://sh.rustup.rs -sSf > $TERMUX_PKG_TMPDIR/rustup.sh
sh $TERMUX_PKG_TMPDIR/rustup.sh -y
export PATH=$HOME/.cargo/bin:$PATH
rustup target add $CARGO_TARGET_NAME
}