From 23e760143b4e0545998bbbc9b81138f5d411ac7b Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sat, 21 Aug 2021 19:03:09 +0200 Subject: [PATCH] termux_step_start_build: get llvm version in standard way And fix indentation, and remove echo of llvm version. --- scripts/build/termux_step_start_build.sh | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/scripts/build/termux_step_start_build.sh b/scripts/build/termux_step_start_build.sh index fe5b57302..aedfa13af 100644 --- a/scripts/build/termux_step_start_build.sh +++ b/scripts/build/termux_step_start_build.sh @@ -49,17 +49,16 @@ termux_step_start_build() { if [ "$TERMUX_INSTALL_DEPS" == true ] && [ "$TERMUX_PKG_DEPENDS" != "${TERMUX_PKG_DEPENDS/libllvm/}" ]; then LLVM_DEFAULT_TARGET_TRIPLE=$TERMUX_HOST_PLATFORM - if [ $TERMUX_ARCH = "arm" ]; then - LLVM_TARGET_ARCH=ARM - elif [ $TERMUX_ARCH = "aarch64" ]; then - LLVM_TARGET_ARCH=AArch64 - elif [ $TERMUX_ARCH = "i686" ]; then - LLVM_TARGET_ARCH=X86 - elif [ $TERMUX_ARCH = "x86_64" ]; then - LLVM_TARGET_ARCH=X86 - fi - LIBLLVM_VERSION=$(grep "TERMUX_PKG_VERSION=" $TERMUX_SCRIPTDIR/packages/libllvm/build.sh | cut -c20- ) - echo "$LIBLLVM_VERSION" + if [ $TERMUX_ARCH = "arm" ]; then + LLVM_TARGET_ARCH=ARM + elif [ $TERMUX_ARCH = "aarch64" ]; then + LLVM_TARGET_ARCH=AArch64 + elif [ $TERMUX_ARCH = "i686" ]; then + LLVM_TARGET_ARCH=X86 + elif [ $TERMUX_ARCH = "x86_64" ]; then + LLVM_TARGET_ARCH=X86 + fi + LIBLLVM_VERSION=$(. $TERMUX_SCRIPTDIR/packages/libllvm/build.sh; echo $TERMUX_PKG_VERSION) sed $TERMUX_SCRIPTDIR/packages/libllvm/llvm-config.in \ -e "s|@TERMUX_PKG_VERSION@|$LIBLLVM_VERSION|g" \ -e "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|g" \