Small tweaks to pcre and libllvm (#1103)

[termux-packages] / packages / libllvm / build.sh

diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh
index b10f755..656bd18 100644 (file)
--- a/packages/libllvm/build.sh
+++ b/packages/libllvm/build.sh
@@ -38,13 +38,12 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCLANG_TOOL_C_INDEX_TEST_BUILD=OFF
 -DC_INCLUDE_DIRS=$TERMUX_PREFIX/include
 -DLLVM_LINK_LLVM_DYLIB=ON
--DPYTHON_EXECUTABLE=`which python2.7`
 -DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen
 -DCLANG_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-tblgen"
 TERMUX_PKG_FORCE_CMAKE=yes
 
 termux_step_post_extract_package () {
-       CLANG_SRC_TAR=cfe-${TERMUX_PKG_VERSION}.src.tar.xz
+       local CLANG_SRC_TAR=cfe-${TERMUX_PKG_VERSION}.src.tar.xz
        termux_download \
                http://llvm.org/releases/${TERMUX_PKG_VERSION}/$CLANG_SRC_TAR \
                $TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR \
@@ -64,7 +63,7 @@ termux_step_host_build () {
 
 termux_step_pre_configure () {
        cd $TERMUX_PKG_BUILDDIR
-       LLVM_DEFAULT_TARGET_TRIPLE=$TERMUX_HOST_PLATFORM
+       local LLVM_DEFAULT_TARGET_TRIPLE=$TERMUX_HOST_PLATFORM
        if [ $TERMUX_ARCH = "arm" ]; then
                LLVM_TARGET_ARCH=ARM
                # See https://github.com/termux/termux-packages/issues/282