From 608a846258f789efadca1f8390a27e5ff1afcee2 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 25 Apr 2019 23:43:57 +0000
Subject: user/llvm8: fix build stuff

---
 user/llvm8/APKBUILD | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'user/llvm8/APKBUILD')

diff --git a/user/llvm8/APKBUILD b/user/llvm8/APKBUILD
index 38f56cd4b..de4969ac7 100644
--- a/user/llvm8/APKBUILD
+++ b/user/llvm8/APKBUILD
@@ -101,7 +101,7 @@ build() {
 		-DLLVM_HOST_TRIPLE="$CHOST" \
 		-DLLVM_INCLUDE_EXAMPLES=OFF \
 		-DLLVM_LINK_LLVM_DYLIB=ON \
-		-DLLVM_TARGETS_TO_BUILD='X86;ARM;AArch64;PowerPC;SystemZ;AMDGPU;NVPTX;Mips;BPF;Sparc;WebAssembly' \
+		-DLLVM_TARGETS_TO_BUILD='AArch64;AMDGPU;ARM;BPF;Mips;PowerPC;Sparc;SystemZ;WebAssembly;X86' \
 		"$builddir"
 
 	make llvm-tblgen
@@ -163,12 +163,7 @@ package() {
 	rmdir include
 	ln -s ../../include/$pkgname include
 
-	# Move /usr/lib/$pkgname/lib/cmake/llvm/ into /usr/lib/cmake/$pkgname/
-	# and symlink it back.
-	_mv lib/cmake/llvm/* "$pkgdir"/usr/lib/cmake/$pkgname/
-	rmdir lib/cmake/llvm
-	ln -s ../../../cmake/$pkgname lib/cmake/llvm
-	ln -s ../$pkgname "$pkgdir"/usr/lib/cmake/llvm
+	ln -s "$pkgdir"/usr/lib/cmake/llvm ../$pkgname/lib/cmake/llvm
 }
 
 static() {
-- 
cgit v1.2.3-60-g2f50