From 4ec7fb16382323fc9afced14a80579e8af4b3bab Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Mon, 16 May 2022 08:45:24 -0700
Subject: [PATCH] llvm: cleanup target build

---
 config/functions                             |  4 ++--
 packages/lang/llvm/package.mk                |  6 ++++--
 packages/lang/llvm/patches/llvm-config.patch | 13 -------------
 3 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 packages/lang/llvm/patches/llvm-config.patch

diff --git a/config/functions b/config/functions
index 7166bb8086..a6e5e594e2 100644
--- a/config/functions
+++ b/config/functions
@@ -482,7 +482,7 @@ cpp = '$CXX'
 ar = '$AR'
 strip = '$STRIP'
 pkgconfig = '$PKG_CONFIG'
-llvm-config = '$TOOLCHAIN/bin/llvm-config-host'
+llvm-config = '$TOOLCHAIN/bin/llvm-config'
 libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config'
 
 [build_machine]
@@ -520,7 +520,7 @@ cpp = '$TARGET_CXX'
 ar = '$TARGET_AR'
 strip = '$TARGET_STRIP'
 pkgconfig = '$PKG_CONFIG'
-llvm-config = '$TOOLCHAIN/bin/llvm-config-host'
+llvm-config = '$SYSROOT_PREFIX/usr/bin/llvm-config'
 libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config'
 
 [build_machine]
diff --git a/packages/lang/llvm/package.mk b/packages/lang/llvm/package.mk
index dcf752f53c..f5324ac5c9 100644
--- a/packages/lang/llvm/package.mk
+++ b/packages/lang/llvm/package.mk
@@ -43,7 +43,6 @@ PKG_CMAKE_OPTS_COMMON="-DLLVM_INCLUDE_TOOLS=ON \
                        -DLLVM_ENABLE_Z3_SOLVER=OFF"
 
 pre_configure_host() {
-  CXXFLAGS+=" -DLLVM_CONFIG_EXEC_PREFIX=\\\"${SYSROOT_PREFIX}/usr\\\""
   PKG_CMAKE_OPTS_HOST="${PKG_CMAKE_OPTS_COMMON}"
 }
 
@@ -59,11 +58,14 @@ make_host() {
 
 makeinstall_host() {
   cp -a lib/libLLVM-*.so ${TOOLCHAIN}/lib
-  cp -a bin/llvm-config ${TOOLCHAIN}/bin/llvm-config-host
+  cp -a bin/llvm-config ${TOOLCHAIN}/bin/llvm-config
   cp -a bin/llvm-tblgen ${TOOLCHAIN}/bin
 }
 
 post_makeinstall_target() {
+  mkdir -p ${SYSROOT_PREFIX}/usr/bin
+    cp -a ${TOOLCHAIN}/bin/llvm-config ${SYSROOT_PREFIX}/usr/bin
+
   rm -rf ${INSTALL}/usr/bin
   rm -rf ${INSTALL}/usr/lib/LLVMHello.so
   rm -rf ${INSTALL}/usr/lib/libLTO.so
diff --git a/packages/lang/llvm/patches/llvm-config.patch b/packages/lang/llvm/patches/llvm-config.patch
deleted file mode 100644
index b50c1a963e..0000000000
--- a/packages/lang/llvm/patches/llvm-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/tools/llvm-config/llvm-config.cpp	2019-12-15 20:54:21.898634608 +0100
-+++ b/tools/llvm-config/llvm-config.cpp	2019-12-15 20:56:12.280223943 +0100
-@@ -285,6 +285,10 @@
-   CurrentExecPrefix =
-       sys::path::parent_path(sys::path::parent_path(CurrentPath)).str();
- 
-+#ifdef LLVM_CONFIG_EXEC_PREFIX
-+  CurrentExecPrefix = LLVM_CONFIG_EXEC_PREFIX;
-+#endif
-+
-   // Check to see if we are inside a development tree by comparing to possible
-   // locations (prefix style or CMake style).
-   if (sys::fs::equivalent(CurrentExecPrefix, LLVM_OBJ_ROOT)) {