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

diff --git a/packages/clang/build.sh b/packages/clang/build.sh
index e2c5d5d2..49fa6d6a 100644
--- a/packages/clang/build.sh
+++ b/packages/clang/build.sh
@@ -1,19 +1,29 @@
 TERMUX_PKG_HOMEPAGE=http://clang.llvm.org/
 TERMUX_PKG_DESCRIPTION="C and C++ frontend for the LLVM compiler"
-_PKG_MAJOR_VERSION=3.6
-TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.2
+_PKG_MAJOR_VERSION=3.8
+TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.1
 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="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
 	test ! -f $TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR && curl http://llvm.org/releases/${TERMUX_PKG_VERSION}/$CLANG_SRC_TAR > $TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR
 
+	# COMPILERRT_SRC_TAR=compiler-rt-${TERMUX_PKG_VERSION}.src.tar.xz
+	# test ! -f $TERMUX_PKG_CACHEDIR/$COMPILERRT_SRC_TAR && curl http://llvm.org/releases/${TERMUX_PKG_VERSION}/${COMPILERRT_SRC_TAR} > $TERMUX_PKG_CACHEDIR/$COMPILERRT_SRC_TAR
+
 	cd $TERMUX_PKG_SRCDIR
+
 	tar -xf $TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR -C tools
 	mv tools/cfe-${TERMUX_PKG_VERSION}.src tools/clang
+
+	# tar -xf $TERMUX_PKG_CACHEDIR/$COMPILERRT_SRC_TAR -C projects
+	# mv projects/compiler-rt-${TERMUX_PKG_VERSION}.src projects/compiler-rt
+
+	# Remove symlinks which are not overwritten on repeated builds even with CMAKE_INSTALL_ALWAYS=1:
+	rm -f $TERMUX_PREFIX/{bin/llvm*,lib/libLLVM*,lib/libclang*}
 }
 
 termux_step_host_build () {
@@ -22,29 +32,35 @@ 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"
-        elif [ $TERMUX_ARCH = "i686" ]; then
-                LLVM_TARGET_ARCH=X86
-        fi
+	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
+	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` \
                 -DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_CROSSCOMPILING=True \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS -lgnustl_shared" \
+		-DCMAKE_INSTALL_ALWAYS=1 \
 		-DCMAKE_INSTALL_PREFIX=$TERMUX_PREFIX \
 		-DCMAKE_LINKER=`which ${TERMUX_HOST_PLATFORM}-ld` \
 		-DCMAKE_RANLIB=`which ${TERMUX_HOST_PLATFORM}-ranlib` \
 		-DCMAKE_SYSTEM_NAME=Linux \
 		-DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen \
-		-DLLVM_DEFAULT_TARGET_TRIPLE=$LLVM_DEFAULT_TARGET_TRIPLE \
+		-DLLVM_DEFAULT_TARGET_TRIPLE=$LLVM_DEFAULT_TARGET_TRIPLE \
 		-DLLVM_TARGET_ARCH=$LLVM_TARGET_ARCH \
 		-DLLVM_TARGETS_TO_BUILD=$LLVM_TARGET_ARCH \
 		-DLLVM_ENABLE_PIC=ON \
@@ -56,5 +72,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++)
 }