Merge pull request #758 from lrusak/llvm

llvm: build llvm-config for host

packages/graphics/mesa/package.mk

@@ -37,7 +37,7 @@ PKG_AUTORECONF="yes"
 
 if [ "$LLVM_SUPPORT" = "yes" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET elfutils llvm"
-  export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config"
+  export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config-host"
   MESA_GALLIUM_LLVM="--enable-gallium-llvm --disable-llvm-shared-libs"
 else
   MESA_GALLIUM_LLVM="--disable-gallium-llvm"

packages/lang/llvm/package.mk

@@ -24,7 +24,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://llvm.org/"
 PKG_URL="http://llvm.org/releases/$PKG_VERSION/${PKG_NAME}-${PKG_VERSION}.src.tar.xz"
 PKG_SOURCE_DIR="${PKG_NAME}-${PKG_VERSION}.src"
-PKG_DEPENDS_TARGET="toolchain zlib"
+PKG_DEPENDS_TARGET="toolchain llvm:host zlib"
 PKG_PRIORITY="optional"
 PKG_SECTION="lang"
 PKG_SHORTDESC="llvm: Low Level Virtual Machine"
@@ -33,6 +33,37 @@ PKG_LONGDESC="Low-Level Virtual Machine (LLVM) is a compiler infrastructure desi
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
+configure_host() {
+  cmake -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN \
+        -DCMAKE_BUILD_TYPE=Release \
+        -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 \
+        ..
+}
+
+make_host() {
+  make llvm-config
+}
+
+makeinstall_host() {
+  cp -a bin/llvm-config $SYSROOT_PREFIX/usr/bin/llvm-config-host
+}
+
 configure_target() {
   cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
         -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
@@ -40,7 +71,7 @@ configure_target() {
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_C_FLAGS="$CFLAGS" \
         -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-        -DLLVM_INCLUDE_TOOLS=ON \
+        -DLLVM_INCLUDE_TOOLS=OFF \
         -DLLVM_BUILD_TOOLS=OFF \
         -DLLVM_BUILD_UTILS=OFF \
         -DLLVM_BUILD_EXAMPLES=OFF \
@@ -63,12 +94,7 @@ configure_target() {
         ..
 }
 
-post_make_target() {
-  make -C $ROOT/$PKG_BUILD/.$TARGET_NAME/ llvm-config
-}
-
 post_makeinstall_target() {
-  cp -a $ROOT/$PKG_BUILD/.$TARGET_NAME/bin/llvm-config $SYSROOT_PREFIX/usr/bin
 
   rm -rf $INSTALL/usr/bin
   rm -rf $INSTALL/usr/lib