From 15018de5cf21b5d9d1d8529b8a97857ba81d4891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Tue, 3 Sep 2024 11:06:51 +0200
Subject: [PATCH] llvm18: libunwind is in $libDir too on x86

Installing: /packages/llvm18_x86-18.1.7-3/.self/lib/x86/libunwind.so.1.0
---
 sys-devel/llvm/llvm18-18.1.7.recipe | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/sys-devel/llvm/llvm18-18.1.7.recipe b/sys-devel/llvm/llvm18-18.1.7.recipe
index cee9d3f7d..8d21f038b 100644
--- a/sys-devel/llvm/llvm18-18.1.7.recipe
+++ b/sys-devel/llvm/llvm18-18.1.7.recipe
@@ -695,13 +695,8 @@ INSTALL()
 		libLLVM* \
 		libLTO	\
 		liblld* \
-		libRemarks
-
-	oldLibDir=$libDir
-	libDir=$prefix/lib
-	prepareInstalledDevelLibs \
+		libRemarks \
 		libunwind
-	libDir=$oldLibDir
 
 	# adjust cmake library paths because prepareInstalledDevelLibs moved them
 	sed -i 's,\${_IMPORT_PREFIX}/lib/,\${_IMPORT_PREFIX}/develop/lib/,' \
@@ -768,7 +763,7 @@ INSTALL()
 
 	# libunwind package
 	packageEntries libunwind \
-		$prefix/lib/libunwind*
+		$libDir/libunwind*
 
 	packageEntries libunwind_devel \
 		$developLibDir/libunwind* \