X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/0b371c427398949754fe055bad44bd4458de5e9c..9cbdadb1fe2c58f1be7cfaa6b502f5d363303d65:/packages/clang/build.sh

diff --git a/packages/clang/build.sh b/packages/clang/build.sh
index e7fe3d2e..772b7fca 100644
--- a/packages/clang/build.sh
+++ b/packages/clang/build.sh
@@ -1,12 +1,15 @@
 TERMUX_PKG_HOMEPAGE=http://clang.llvm.org/
 TERMUX_PKG_DESCRIPTION="C and C++ frontend for the LLVM compiler"
 _PKG_MAJOR_VERSION=3.8
-TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.0
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.1
+TERMUX_PKG_BUILD_REVISION=3
 TERMUX_PKG_SRCURL=http://llvm.org/releases/${TERMUX_PKG_VERSION}/llvm-${TERMUX_PKG_VERSION}.src.tar.xz
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_RM_AFTER_INSTALL="bin/macho-dump bin/bugpoint bin/llvm-tblgen lib/BugpointPasses.so lib/LLVMHello.so"
-TERMUX_PKG_DEPENDS="binutils, libgnustl, ncurses, ndk-sysroot, libgcc"
+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
+TERMUX_PKG_REPLACES=gcc
 
 termux_step_post_extract_package () {
 	CLANG_SRC_TAR=cfe-${TERMUX_PKG_VERSION}.src.tar.xz
@@ -34,17 +37,21 @@ termux_step_host_build () {
 
 termux_step_configure () {
 	cd $TERMUX_PKG_BUILDDIR
-        LLVM_DEFAULT_TARGET_TRIPLE=$TERMUX_HOST_PLATFORM
-        LLVM_TARGET_ARCH=$TERMUX_ARCH
-        if [ $TERMUX_ARCH = "arm" ]; then
-                LLVM_TARGET_ARCH=ARM
-                LLVM_DEFAULT_TARGET_TRIPLE="armv7a-linux-androideabihf"
-        elif [ $TERMUX_ARCH = "i686" ]; then
-                LLVM_TARGET_ARCH=X86
+	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
+		LLVM_DEFAULT_TARGET_TRIPLE="armv7a-linux-androideabi"
 	elif [ $TERMUX_ARCH = "aarch64" ]; then
 		LLVM_TARGET_ARCH=AArch64
-		LLVM_DEFAULT_TARGET_TRIPLE="aarch64-linux-android"
-        fi
+	elif [ $TERMUX_ARCH = "i686" ]; then
+		LLVM_TARGET_ARCH=X86
+	elif [ $TERMUX_ARCH = "x86_64" ]; then
+		LLVM_TARGET_ARCH=X86
+	else
+		echo "Invalid arch: $TERMUX_ARCH"
+		exit 1
+	fi
         # see CMakeLists.txt and tools/clang/CMakeLists.txt
 	cmake -G "Unix Makefiles" .. \
 		-DCMAKE_AR=`which ${TERMUX_HOST_PLATFORM}-ar` \
@@ -55,7 +62,7 @@ termux_step_configure () {
 		-DCMAKE_INSTALL_PREFIX=$TERMUX_PREFIX \
 		-DCMAKE_LINKER=`which ${TERMUX_HOST_PLATFORM}-ld` \
 		-DCMAKE_RANLIB=`which ${TERMUX_HOST_PLATFORM}-ranlib` \
-		-DCMAKE_SYSTEM_NAME=Linux \
+		-DCMAKE_SYSTEM_NAME=Android \
 		-DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen \
 		-DLLVM_DEFAULT_TARGET_TRIPLE=$LLVM_DEFAULT_TARGET_TRIPLE \
 		-DLLVM_TARGET_ARCH=$LLVM_TARGET_ARCH \
@@ -69,6 +76,9 @@ termux_step_configure () {
 }
 
 termux_step_post_make_install () {
-        (cd $TERMUX_PREFIX/bin && ln -f -s clang-${_PKG_MAJOR_VERSION} clang && ln -f -s clang-${_PKG_MAJOR_VERSION} clang++)
-        (cd $TERMUX_PREFIX/bin && ln -f -s clang-${_PKG_MAJOR_VERSION} cc && ln -f -s clang-${_PKG_MAJOR_VERSION} c++)
+	cd $TERMUX_PREFIX/bin
+
+	for tool in clang clang++ cc c++ cpp gcc g++ ${TERMUX_HOST_PLATFORM}-{gcc,g++,cpp}; do
+		ln -f -s clang-${_PKG_MAJOR_VERSION} $tool
+	done
 }