From aa0b6f93c2aba9fc8395abd4e555dcb5521d8201 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Thu, 2 Nov 2017 08:44:59 -0700
Subject: [PATCH] llvm: seperate out common llvm config options

---
 packages/lang/llvm/package.mk | 60 ++++++++++++-----------------------
 1 file changed, 21 insertions(+), 39 deletions(-)

diff --git a/packages/lang/llvm/package.mk b/packages/lang/llvm/package.mk
index db154d2caa..c78a6f13ed 100644
--- a/packages/lang/llvm/package.mk
+++ b/packages/lang/llvm/package.mk
@@ -31,44 +31,9 @@ PKG_SHORTDESC="llvm: Low Level Virtual Machine"
 PKG_LONGDESC="Low-Level Virtual Machine (LLVM) is a compiler infrastructure designed for compile-time, link-time, run-time, and idle-time optimization of programs from arbitrary programming languages. It currently supports compilation of C, Objective-C, and C++ programs, using front-ends derived from GCC 4.0, GCC 4.2, and a custom new front-end, "clang". It supports x86, x86-64, ia64, PowerPC, and SPARC, with support for Alpha and ARM under development."
 PKG_AUTORECONF="no"
 
-PKG_CMAKE_OPTS_HOST="-DLLVM_INCLUDE_TOOLS=ON \
-                     -DLLVM_BUILD_TOOLS=OFF \
-                     -DLLVM_BUILD_UTILS=OFF \
-                     -DLLVM_BUILD_EXAMPLES=OFF \
-                     -DLLVM_INCLUDE_EXAMPLES=OFF \
-                     -DLLVM_BUILD_TESTS=OFF \
-                     -DLLVM_INCLUDE_TESTS=OFF \
-                     -DLLVM_INCLUDE_GO_TESTS=OFF \
-                     -DLLVM_BUILD_DOCS=OFF \
-                     -DLLVM_INCLUDE_DOCS=OFF \
-                     -DLLVM_ENABLE_DOXYGEN=OFF \
-                     -DLLVM_ENABLE_SPHINX=OFF \
-                     -DLLVM_TARGETS_TO_BUILD="AMDGPU" \
-                     -DLLVM_ENABLE_TERMINFO=OFF \
-                     -DLLVM_ENABLE_ASSERTIONS=OFF \
-                     -DLLVM_ENABLE_WERROR=OFF \
-                     -DLLVM_ENABLE_ZLIB=OFF \
-                     -DLLVM_BUILD_LLVM_DYLIB=ON \
-                     -DLLVM_LINK_LLVM_DYLIB=ON \
-                     -DLLVM_OPTIMIZED_TABLEGEN=ON \
-                     -DCMAKE_INSTALL_RPATH=$TOOLCHAIN/lib \
-                     -DLLVM_APPEND_VC_REV=OFF"
-
-make_host() {
-  ninja llvm-config llvm-tblgen
-}
-
-makeinstall_host() {
-  cp -a bin/llvm-config $SYSROOT_PREFIX/usr/bin/llvm-config-host
-  cp -a bin/llvm-tblgen $TOOLCHAIN/bin
-}
-
-PKG_CMAKE_OPTS_TARGET="-DCMAKE_BUILD_TYPE=MinSizeRel \
-                       -DCMAKE_C_FLAGS="$CFLAGS" \
-                       -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-                       -DLLVM_INCLUDE_TOOLS=ON \
+PKG_CMAKE_OPTS_COMMON="-DLLVM_INCLUDE_TOOLS=ON \
                        -DLLVM_BUILD_TOOLS=OFF \
-                       -DLLVM_BUILD_UTILS=ON \
+                       -DLLVM_BUILD_UTILS=OFF \
                        -DLLVM_BUILD_EXAMPLES=OFF \
                        -DLLVM_INCLUDE_EXAMPLES=OFF \
                        -DLLVM_BUILD_TESTS=OFF \
@@ -82,14 +47,31 @@ PKG_CMAKE_OPTS_TARGET="-DCMAKE_BUILD_TYPE=MinSizeRel \
                        -DLLVM_ENABLE_TERMINFO=OFF \
                        -DLLVM_ENABLE_ASSERTIONS=OFF \
                        -DLLVM_ENABLE_WERROR=OFF \
-                       -DLLVM_TARGET_ARCH="$TARGET_ARCH" \
                        -DLLVM_ENABLE_ZLIB=ON \
                        -DLLVM_BUILD_LLVM_DYLIB=ON \
                        -DLLVM_LINK_LLVM_DYLIB=ON \
                        -DLLVM_OPTIMIZED_TABLEGEN=ON \
-                       -DLLVM_TABLEGEN=$TOOLCHAIN/bin/llvm-tblgen \
                        -DLLVM_APPEND_VC_REV=OFF"
 
+PKG_CMAKE_OPTS_HOST="$PKG_CMAKE_OPTS_COMMON \
+                     -DCMAKE_INSTALL_RPATH=$TOOLCHAIN/lib"
+
+make_host() {
+  ninja llvm-config llvm-tblgen
+}
+
+makeinstall_host() {
+  cp -a bin/llvm-config $SYSROOT_PREFIX/usr/bin/llvm-config-host
+  cp -a bin/llvm-tblgen $TOOLCHAIN/bin
+}
+
+PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_COMMON \
+                       -DCMAKE_BUILD_TYPE=MinSizeRel \
+                       -DCMAKE_C_FLAGS="$CFLAGS" \
+                       -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+                       -DLLVM_TARGET_ARCH="$TARGET_ARCH" \
+                       -DLLVM_TABLEGEN=$TOOLCHAIN/bin/llvm-tblgen"
+
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
   rm -rf $INSTALL/usr/lib/LLVMHello.so