X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/fce29be57d16a0bf7d79ee7c002c93cd33637eca..d5436b6160db126f010902cc21c2851cab379015:/packages/clang/build.sh

diff --git a/packages/clang/build.sh b/packages/clang/build.sh
index 91038e5c..d1837355 100644
--- a/packages/clang/build.sh
+++ b/packages/clang/build.sh
@@ -1,11 +1,12 @@
 TERMUX_PKG_HOMEPAGE=http://clang.llvm.org/
 TERMUX_PKG_DESCRIPTION="C and C++ frontend for the LLVM compiler"
-_PKG_MAJOR_VERSION=3.7
-TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.1
+_PKG_MAJOR_VERSION=3.8
+TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.0
+TERMUX_PKG_BUILD_REVISION=5
 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"
+TERMUX_PKG_DEPENDS="binutils, libgnustl, ncurses, ndk-sysroot, ndk-stl, libgcc"
 
 termux_step_post_extract_package () {
 	CLANG_SRC_TAR=cfe-${TERMUX_PKG_VERSION}.src.tar.xz
@@ -32,19 +33,17 @@ termux_step_host_build () {
 }
 
 termux_step_configure () {
-	CXXFLAGS+=" -fno-devirtualize" # Avoid hitting https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61659
-
 	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"
+		# See https://github.com/termux/termux-packages/issues/282
+		LLVM_DEFAULT_TARGET_TRIPLE="armv7a-linux-androideabi"
         elif [ $TERMUX_ARCH = "i686" ]; then
                 LLVM_TARGET_ARCH=X86
 	elif [ $TERMUX_ARCH = "aarch64" ]; then
 		LLVM_TARGET_ARCH=AArch64
-		LLVM_DEFAULT_TARGET_TRIPLE="aarch64-linux-android"
         fi
         # see CMakeLists.txt and tools/clang/CMakeLists.txt
 	cmake -G "Unix Makefiles" .. \
@@ -70,5 +69,6 @@ termux_step_configure () {
 }
 
 termux_step_post_make_install () {
-        (cd $TERMUX_PREFIX/bin && rm -f clang clang++ && ln -s clang-${_PKG_MAJOR_VERSION} clang && ln -s clang-${_PKG_MAJOR_VERSION} clang++)
+        (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++)
 }