X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/edc3049a03002e6c057073c4363cf59c0f484109..f1857303a588295579d5c9276b9fc3857fe6bbfd:/packages/libllvm/build.sh

diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh
index b824fa47..dc3b9c1a 100644
--- a/packages/libllvm/build.sh
+++ b/packages/libllvm/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://clang.llvm.org/
 TERMUX_PKG_DESCRIPTION="Modular compiler and toolchain technologies library"
 _PKG_MAJOR_VERSION=3.9
 TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=http://llvm.org/releases/${TERMUX_PKG_VERSION}/llvm-${TERMUX_PKG_VERSION}.src.tar.xz
 TERMUX_PKG_SHA256=1fd90354b9cf19232e8f168faf2220e79be555df3aa743242700879e8fd329ee
 TERMUX_PKG_HOSTBUILD=true
@@ -25,7 +25,8 @@ share/scan-view
 "
 TERMUX_PKG_DEPENDS="binutils, ncurses, ndk-sysroot, ndk-stl, libgcc"
 # Replace gcc since gcc is deprecated by google on android and is not maintained upstream.
-TERMUX_PKG_CONFLICTS=gcc
+# Conflict with clang versions earlier than 3.9.1-3 since they bundled llvm.
+TERMUX_PKG_CONFLICTS="gcc, clang (<< 3.9.1-3)"
 TERMUX_PKG_REPLACES=gcc
 # See http://llvm.org/docs/CMake.html:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@@ -73,8 +74,7 @@ termux_step_pre_configure () {
 	elif [ $TERMUX_ARCH = "x86_64" ]; then
 		LLVM_TARGET_ARCH=X86
 	else
-		echo "Invalid arch: $TERMUX_ARCH"
-		exit 1
+		termux_error_exit "Invalid arch: $TERMUX_ARCH"
 	fi
         # see CMakeLists.txt and tools/clang/CMakeLists.txt
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DLLVM_DEFAULT_TARGET_TRIPLE=$LLVM_DEFAULT_TARGET_TRIPLE"