[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     ba77142fd668fd93a03f188cf2bcc791624ca05b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 16 07:50:30 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 11:32:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba77142f

llvm-utils.eclass: Support -b/-d to llvm_prepend_path

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/llvm-utils.eclass | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/eclass/llvm-utils.eclass b/eclass/llvm-utils.eclass
index 1ae3295484c8..b105e169fbc4 100644
--- a/eclass/llvm-utils.eclass
+++ b/eclass/llvm-utils.eclass
@@ -113,17 +113,38 @@ llvm_fix_tool_path() {
 }
 
 # @FUNCTION: llvm_prepend_path
-# @USAGE: <slot>
+# @USAGE: [-b|-d] <slot>
 # @DESCRIPTION:
 # Prepend the path to the specified LLVM slot to PATH variable,
 # and reexport it.
+#
+# With no option or "-d", the path is prefixed by ESYSROOT.  LLVM
+# dependencies should be in DEPEND then.
+#
+# With "-b" option, the path is prefixed by BROOT. LLVM dependencies
+# should be in BDEPEND then.
 llvm_prepend_path() {
        debug-print-function ${FUNCNAME} "$@"
 
-       [[ ${#} -ne 1 ]] && die "Usage: ${FUNCNAME} <slot>"
+       local prefix
+       case ${1--d} in
+               -d)
+                       prefix=${ESYSROOT}
+                       shift
+                       ;;
+               -b)
+                       prefix=${BROOT}
+                       shift
+                       ;;
+               -*)
+                       die "${FUNCNAME}: invalid option: ${1}"
+                       ;;
+       esac
+
+       [[ ${#} -ne 1 ]] && die "Usage: ${FUNCNAME} [-b|-d] <slot>"
        local slot=${1}
 
-       local llvm_path=${ESYSROOT}/usr/lib/llvm/${slot}/bin
+       local llvm_path=${prefix}/usr/lib/llvm/${slot}/bin
        local IFS=:
        local split_path=( ${PATH} )
        local new_path=()