X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/768ce14ecc1048cdfc8fcf0d51baaba5c33a163b..508fa73cb8ff2a01a37c7082905c991937549e24:/packages/clang/build.sh?ds=sidebyside

diff --git a/packages/clang/build.sh b/packages/clang/build.sh
index 3d7b5e29..2ccf2016 100644
--- a/packages/clang/build.sh
+++ b/packages/clang/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=http://clang.llvm.org/
 TERMUX_PKG_DESCRIPTION="C and C++ frontend for the LLVM compiler"
-_PKG_MAJOR_VERSION=3.8
+_PKG_MAJOR_VERSION=3.9
 TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.1
-TERMUX_PKG_BUILD_REVISION=1
 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
 TERMUX_PKG_RM_AFTER_INSTALL="bin/macho-dump bin/bugpoint bin/llvm-tblgen lib/BugpointPasses.so lib/LLVMHello.so"
 TERMUX_PKG_DEPENDS="binutils, ncurses, ndk-sysroot, ndk-stl, libgcc"
@@ -13,13 +13,13 @@ TERMUX_PKG_REPLACES=gcc
 
 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
+	test ! -f $TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR && termux_download http://llvm.org/releases/${TERMUX_PKG_VERSION}/$CLANG_SRC_TAR \
+		$TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR \
+		e6c4cebb96dee827fa0470af313dff265af391cb6da8d429842ef208c8f25e63
 
 	# 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
 
@@ -31,8 +31,10 @@ termux_step_post_extract_package () {
 }
 
 termux_step_host_build () {
-	cmake -G "Unix Makefiles" $TERMUX_PKG_SRCDIR
-	make -j $TERMUX_MAKE_PROCESSES V=1
+	cmake -G "Unix Makefiles" $TERMUX_PKG_SRCDIR \
+		-DLLVM_BUILD_TESTS=OFF \
+		-DLLVM_INCLUDE_TESTS=OFF
+	make -j $TERMUX_MAKE_PROCESSES clang-tblgen llvm-tblgen
 }
 
 termux_step_configure () {
@@ -53,7 +55,7 @@ termux_step_configure () {
 		exit 1
 	fi
         # see CMakeLists.txt and tools/clang/CMakeLists.txt
-	cmake -G "Unix Makefiles" .. \
+	cmake -G "Unix Makefiles" $TERMUX_PKG_SRCDIR \
 		-DCMAKE_AR=`which ${TERMUX_HOST_PLATFORM}-ar` \
                 -DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_CROSSCOMPILING=True \
@@ -62,29 +64,25 @@ 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 \
 		-DLLVM_TARGETS_TO_BUILD=$LLVM_TARGET_ARCH \
 		-DLLVM_ENABLE_PIC=ON \
-                -DLLVM_INCLUDE_TESTS=Off \
+		-DLLVM_BUILD_TESTS=OFF \
+		-DLLVM_INCLUDE_TESTS=OFF \
 		-DCLANG_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-tblgen \
+		-DCLANG_INCLUDE_TESTS=OFF \
+		-DCLANG_TOOL_C_INDEX_TEST_BUILD=OFF \
 		-DC_INCLUDE_DIRS=$TERMUX_PREFIX/include \
-                -DBUILD_SHARED_LIBS=On \
-		$TERMUX_PKG_SRCDIR
+		-DBUILD_SHARED_LIBS=ON
 }
 
 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++
-	ln -f -s clang-${_PKG_MAJOR_VERSION} cc
-	ln -f -s clang-${_PKG_MAJOR_VERSION} c++
-
-	ln -f -s clang-${_PKG_MAJOR_VERSION} gcc
-	ln -f -s clang-${_PKG_MAJOR_VERSION} g++
-	ln -f -s clang-${_PKG_MAJOR_VERSION} ${TERMUX_HOST_PLATFORM}-gcc
-	ln -f -s clang-${_PKG_MAJOR_VERSION} ${TERMUX_HOST_PLATFORM}-g++
+	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
 }