clang: Depend on libgcc (fixes #72)

[termux-packages] / packages / clang / build.sh

diff --git a/packages/clang/build.sh b/packages/clang/build.sh
index ceb3004..d4dd316 100644 (file)
--- a/packages/clang/build.sh
+++ b/packages/clang/build.sh
@@ -1,19 +1,30 @@
 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}.1
+_PKG_MAJOR_VERSION=3.8
+TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.0
+TERMUX_PKG_BUILD_REVISION=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, 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,8 +33,6 @@ 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
@@ -32,6 +41,9 @@ termux_step_configure () {
                 LLVM_DEFAULT_TARGET_TRIPLE="armv7a-linux-androideabihf"
         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" .. \
@@ -39,12 +51,13 @@ termux_step_configure () {
                 -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 \