Always export CMAKE_INSTALL_ALWAYS=1 for cmake builds

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

diff --git a/packages/clang/build.sh b/packages/clang/build.sh
index dad79c3..e3f5f53 100644 (file)
--- 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
@@ -11,16 +11,24 @@ TERMUX_PKG_DEPENDS="binutils, ncurses, ndk-sysroot, ndk-stl, libgcc"
 # Replace gcc since gcc is deprecated by google on android and is not maintained upstream.
 TERMUX_PKG_CONFLICTS=gcc
 TERMUX_PKG_REPLACES=gcc
+# We would like to use LLVM_LINK_LLVM_DYLIB instead of BUILD_SHARED_LIBS,
+# as http://llvm.org/docs/CMake.html says
+# "BUILD_SHARED_LIBS is only recommended for use by LLVM developers. If you want
+# to build LLVM as a shared library, you should use the LLVM_BUILD_LLVM_DYLIB option."
+# and using fewer shared libraries will make it easier to split up llvm from clang.
+# But switching to LLVM_LINK_LLVM_DYLIB currently causes linker errors.
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DLLVM_ENABLE_PIC=ON
 -DLLVM_BUILD_TESTS=OFF
 -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
 -DCLANG_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-tblgen"
+TERMUX_PKG_FORCE_CMAKE=yes
 
 termux_step_post_extract_package () {
        CLANG_SRC_TAR=cfe-${TERMUX_PKG_VERSION}.src.tar.xz
@@ -30,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