[gentoo-commits] proj/portage:multilib commit in: bin/

[Thomas Sachau]

commit:     0bfcb49daadf993b26c6b782b5121fe4a6017eea
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 15:57:39 2017 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 15:57:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=0bfcb49d

Add workarounds for llvm

 bin/auto-multilib.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index b5043e041..eabef5daf 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -275,7 +275,7 @@ _finalize_abi_install() {
 
 	# Create wrapper symlink for *-config files
 	local i=
-	prep_ml_binaries $(find "${D}"usr/bin "${D}"usr/sbin "${D}"bin "${D}"sbin -type f -name '*-config' 2>/dev/null)
+	prep_ml_binaries $(find "${D}"usr/bin "${D}"usr/sbin "${D}"bin "${D}"sbin "${D}"usr/lib/llvm/*/bin -type f -name '*-config' 2>/dev/null)
 
 	local noabi=()
 	for i in ${MULTILIB_ABIS}; do
@@ -287,8 +287,10 @@ _finalize_abi_install() {
 		done
 	fi
 	local LIBDIR=$(portage-get_abi_var LIBDIR $1)
+	#FIXME: better way then hardcoding llvm to work around /usr/lib/llvm/${LIBDIR}
 	if ( [[ -d "${D}${LIBDIR}" ]] || [[ -d "${D}usr/${LIBDIR}" ]] || [[ -d "${base}" ]] || \
-			(shopt -s nullglob dotglob; f=("${D}"usr/bin/*-config); ((${#f[@]}))) || \
+		(shopt -s nullglob dotglob; f=("${D}"usr/bin/*-config); ((${#f[@]}))) || \
+		(shopt -s nullglob dotglob; f=("${D}"usr/lib/llvm/*/bin/*-config); ((${#f[@]}))) || \
 		( use abiwrapper && \
 			( [[ -d "${D}"usr/bin ]] || \
 				[[ -d "${D}"usr/sbin ]] || [[ -d "${D}"bin ]] || [[ -d "${D}"sbin ]])) ); then