X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/4f4b49667481af0fbed69913113094bc3efb03c1..160874611fb7c591ecace9a98ede9a0b328b0269:/packages/clang/build.sh

diff --git a/packages/clang/build.sh b/packages/clang/build.sh
index 43863092..e3f5f538 100644
--- a/packages/clang/build.sh
+++ b/packages/clang/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://clang.llvm.org/
 TERMUX_PKG_DESCRIPTION="C and C++ frontend for the LLVM compiler"
 _PKG_MAJOR_VERSION=3.9
 TERMUX_PKG_VERSION=${_PKG_MAJOR_VERSION}.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 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
@@ -23,6 +23,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DLLVM_INCLUDE_TESTS=OFF
 -DCLANG_INCLUDE_TESTS=OFF
 -DCLANG_TOOL_C_INDEX_TEST_BUILD=OFF
+-DC_INCLUDE_DIRS=$TERMUX_PREFIX/include
 -DBUILD_SHARED_LIBS=ON
 -DPYTHON_EXECUTABLE=`which python2.7`
 -DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen
@@ -37,11 +38,10 @@ termux_step_post_extract_package () {
 
 	tar -xf $TERMUX_PKG_CACHEDIR/$CLANG_SRC_TAR -C tools
 	mv tools/cfe-${TERMUX_PKG_VERSION}.src tools/clang
-
-	export CMAKE_INSTALL_ALWAYS=1
 }
 
 termux_step_host_build () {
+	termux_setup_cmake
 	cmake -G "Unix Makefiles" $TERMUX_PKG_SRCDIR \
 		-DLLVM_BUILD_TESTS=OFF \
 		-DLLVM_INCLUDE_TESTS=OFF