From df935cfb3e4e1da125524e23ca8be404ee5921b7 Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Mon, 3 Aug 2020 11:07:19 +0100 Subject: [PATCH] libllvm: don't rm clang-import-test https://github.com/termux/termux-packages/issues/5382#issuecomment-641155664 --- packages/libllvm/build.sh | 2 +- packages/lldb/build.sh | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh index 4b9b3db1f..0791a64b1 100644 --- a/packages/libllvm/build.sh +++ b/packages/libllvm/build.sh @@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://clang.llvm.org/ TERMUX_PKG_DESCRIPTION="Modular compiler and toolchain technologies library" TERMUX_PKG_LICENSE="NCSA" TERMUX_PKG_VERSION=10.0.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=(c5d8e30b57cbded7128d78e5e8dad811bff97a8d471896812f57fa99ee82cdf3 f99afc382b88e622c689b6d96cadfa6241ef55dca90e87fc170352e12ddb2b24 591449e0aa623a6318d5ce2371860401653c48bb540982ccdd933992cb88df7a @@ -14,7 +15,6 @@ TERMUX_PKG_SRCURL=(https://github.com/llvm/llvm-project/releases/download/llvmor https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/clang-tools-extra-$TERMUX_PKG_VERSION.src.tar.xz) TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_RM_AFTER_INSTALL=" -bin/clang-import-test bin/clang-offload-wrapper lib/libgomp.a lib/libiomp5.a diff --git a/packages/lldb/build.sh b/packages/lldb/build.sh index 37a6b055a..ed1016cb1 100644 --- a/packages/lldb/build.sh +++ b/packages/lldb/build.sh @@ -38,11 +38,10 @@ termux_step_host_build() { } termux_step_pre_configure() { - # These will be there if libllvm was built from scratch, but not if the pre-built + # This will be there if libllvm was built from scratch, but not if the pre-built # package was extracted. Not really needed but the stupid clang CMake config makes - # sure they're there. - if [ ! -f "$TERMUX_PREFIX/bin/clang-import-test" ]; then - touch $TERMUX_PREFIX/bin/clang-import-test + # sure it's there. + if [ ! -f "$TERMUX_PREFIX/bin/clang-offload-wrapper" ]; then touch $TERMUX_PREFIX/bin/clang-offload-wrapper touch $TERMUX_PKG_BUILDDIR/rm-fake-ci-test fi @@ -55,6 +54,6 @@ termux_step_make() { termux_step_post_make_install() { cp $TERMUX_PKG_BUILDDIR/docs/man/lldb.1 $TERMUX_PREFIX/share/man/man1 if [ -f "$TERMUX_PKG_BUILDDIR/rm-fake-ci-test" ]; then - rm $TERMUX_PREFIX/bin/clang-{import-test,offload-wrapper} + rm $TERMUX_PREFIX/bin/clang-offload-wrapper fi }