clang: add OpenMP library, should now work

diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh
index dad30676172a9d0e16e78c7f603e98c0ad9de178..1925408bc335c1e29e0378f03bfca032cca2f3ae 100644 (file)
--- a/packages/libllvm/build.sh
+++ b/packages/libllvm/build.sh
@@ -19,6 +19,8 @@ bin/sanstats
 bin/scan-build
 bin/scan-view
 lib/BugpointPasses.so
 bin/scan-build
 bin/scan-view
 lib/BugpointPasses.so

+lib/libclang*.a
+lib/libLLVM*.a

 lib/libLTO.so
 lib/LLVMHello.so
 share/man/man1/scan-build.1
 lib/libLTO.so
 lib/LLVMHello.so
 share/man/man1/scan-build.1


@@ -45,6 +47,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen
 -DCLANG_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-tblgen"
 TERMUX_PKG_FORCE_CMAKE=yes
 -DLLVM_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/llvm-tblgen
 -DCLANG_TABLEGEN=$TERMUX_PKG_HOSTBUILD_DIR/bin/clang-tblgen"
 TERMUX_PKG_FORCE_CMAKE=yes

+TERMUX_PKG_KEEP_STATIC_LIBRARIES=true

 
 termux_step_post_extract_package () {
        local CLANG_SRC_TAR=cfe-${TERMUX_PKG_VERSION}.src.tar.xz
 
 termux_step_post_extract_package () {
        local CLANG_SRC_TAR=cfe-${TERMUX_PKG_VERSION}.src.tar.xz


@@ -93,6 +96,16 @@ termux_step_post_make_install () {
        for tool in clang clang++ cc c++ cpp gcc g++ ${TERMUX_HOST_PLATFORM}-{clang,clang++,gcc,g++,cpp}; do
                ln -f -s clang-${_PKG_MAJOR_VERSION} $tool
        done
        for tool in clang clang++ cc c++ cpp gcc g++ ${TERMUX_HOST_PLATFORM}-{clang,clang++,gcc,g++,cpp}; do
                ln -f -s clang-${_PKG_MAJOR_VERSION} $tool
        done

+
+       local OPENMP_ARCH
+       if [ $TERMUX_ARCH = "i686" ]; then
+               OPENMP_ARCH="i386"
+       else
+               OPENMP_ARCH=$TERMUX_ARCH
+       fi
+
+       local OPENMP_PATH=lib64/clang/5.0/lib/linux/$OPENMP_ARCH/libomp.a
+       cp $TERMUX_STANDALONE_TOOLCHAIN/$OPENMP_PATH $TERMUX_PREFIX/lib

 }
 
 termux_step_post_massage () {
 }
 
 termux_step_post_massage () {

diff --git a/packages/libllvm/clang.subpackage.sh b/packages/libllvm/clang.subpackage.sh
index 2cacea3186ad9ca053c9a356c27d870763754349..9dd573232000ac85a1b37603f5697af852e4488b 100644 (file)
--- a/packages/libllvm/clang.subpackage.sh
+++ b/packages/libllvm/clang.subpackage.sh
@@ -7,6 +7,7 @@ bin/*g++
 bin/*gcc
 bin/scan-build
 lib/clang
 bin/*gcc
 bin/scan-build
 lib/clang

+lib/libomp.a

 libexec/
 share/clang
 "
 libexec/
 share/clang
 "