commit:     d9e9a8cc4d32799706f06ed57685ce0adacfdaf3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 18:07:57 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 18:12:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e9a8cc

sys-libs/compiler-rt-sanitizers: Force matching LLVM version

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

 .../compiler-rt-sanitizers-13.0.1.ebuild           | 27 +++++++++++-----------
 .../compiler-rt-sanitizers-14.0.6.ebuild           | 27 +++++++++++-----------
 .../compiler-rt-sanitizers-15.0.0.9999.ebuild      | 27 +++++++++++-----------
 .../compiler-rt-sanitizers-15.0.0.ebuild           | 27 +++++++++++-----------
 .../compiler-rt-sanitizers-16.0.0.9999.ebuild      | 27 +++++++++++-----------
 5 files changed, 65 insertions(+), 70 deletions(-)

diff --git 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.ebuild 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.ebuild
index 31db6dab462c..d30653aef2a7 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.ebuild
@@ -30,10 +30,9 @@ REQUIRED_USE="
        )"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
+LLVM_MAX_SLOT=${SLOT%%.*}
 DEPEND="
-       >=sys-devel/llvm-6
+       sys-devel/llvm:${LLVM_MAX_SLOT}
        virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]"
 BDEPEND="
        >=dev-util/cmake-3.16
@@ -42,7 +41,7 @@ BDEPEND="
        test? (
                !!<sys-apps/sandbox-2.13
                $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
-               =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+               =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}
                sys-libs/compiler-rt:${SLOT}
        )
        !test? (
@@ -154,14 +153,14 @@ src_configure() {
                        -DLLVM_LIT_ARGS="$(get_lit_flags)"
 
                        # they are created during src_test()
-                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
-                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
+                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
+                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
                )
 
                # same flags are passed for build & tests, so we need to strip
                # them down to a subset supported by clang
-               CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
+               CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \
+               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
                strip-unsupported-flags
        fi
 
@@ -188,17 +187,17 @@ src_configure() {
 
                # copy clang over since resource_dir is located relatively to 
binary
                # therefore, we can put our new libraries in it
-               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include}
 || die
-               cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
-                       "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
+               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include}
 || die
+               cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \
+                       "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die
                cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
                        "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
                cp "${sys_dir}"/*builtins*.a \
                        "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || 
die
                # we also need LLVMgold.so for gold-based tests
-               if [[ -f 
${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
-                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
-                               
"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
+               if [[ -f 
${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \
+                               
"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die
                fi
        fi
 }

diff --git 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild
index a2820bf91977..39ddc77f00f3 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild
@@ -34,10 +34,9 @@ RESTRICT="
        !test? ( test )
 "
 
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
+LLVM_MAX_SLOT=${SLOT%%.*}
 DEPEND="
-       >=sys-devel/llvm-6
+       sys-devel/llvm:${LLVM_MAX_SLOT}
        virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
 "
 BDEPEND="
@@ -47,7 +46,7 @@ BDEPEND="
        test? (
                !!<sys-apps/sandbox-2.13
                $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
-               =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+               =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}
                sys-libs/compiler-rt:${SLOT}
        )
        !test? (
@@ -160,14 +159,14 @@ src_configure() {
                        -DLLVM_LIT_ARGS="$(get_lit_flags)"
 
                        # they are created during src_test()
-                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
-                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
+                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
+                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
                )
 
                # same flags are passed for build & tests, so we need to strip
                # them down to a subset supported by clang
-               CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
+               CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \
+               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
                strip-unsupported-flags
        fi
 
@@ -194,17 +193,17 @@ src_configure() {
 
                # copy clang over since resource_dir is located relatively to 
binary
                # therefore, we can put our new libraries in it
-               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include}
 || die
-               cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
-                       "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
+               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include}
 || die
+               cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \
+                       "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die
                cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
                        "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
                cp "${sys_dir}"/*builtins*.a \
                        "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || 
die
                # we also need LLVMgold.so for gold-based tests
-               if [[ -f 
${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
-                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
-                               
"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
+               if [[ -f 
${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \
+                               
"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die
                fi
        fi
 }

diff --git 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild
index 0583125b7515..f716dc74b423 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild
@@ -34,10 +34,9 @@ RESTRICT="
        !test? ( test )
 "
 
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
+LLVM_MAX_SLOT=${SLOT%%.*}
 DEPEND="
-       >=sys-devel/llvm-6
+       sys-devel/llvm:${LLVM_MAX_SLOT}
        virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
 "
 BDEPEND="
@@ -47,7 +46,7 @@ BDEPEND="
        test? (
                !!<sys-apps/sandbox-2.13
                $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-               =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+               =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}
                sys-libs/compiler-rt:${SLOT}
        )
        !test? (
@@ -160,14 +159,14 @@ src_configure() {
                        -DLLVM_LIT_ARGS="$(get_lit_flags)"
 
                        # they are created during src_test()
-                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
-                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
+                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
+                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
                )
 
                # same flags are passed for build & tests, so we need to strip
                # them down to a subset supported by clang
-               CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
+               CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \
+               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
                strip-unsupported-flags
        fi
 
@@ -194,17 +193,17 @@ src_configure() {
 
                # copy clang over since resource_dir is located relatively to 
binary
                # therefore, we can put our new libraries in it
-               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include}
 || die
-               cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
-                       "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
+               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include}
 || die
+               cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \
+                       "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die
                cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
                        "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
                cp "${sys_dir}"/*builtins*.a \
                        "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || 
die
                # we also need LLVMgold.so for gold-based tests
-               if [[ -f 
${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
-                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
-                               
"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
+               if [[ -f 
${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \
+                               
"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die
                fi
        fi
 }

diff --git 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.ebuild 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.ebuild
index bf3e9bca305f..6e0758b7c6c1 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.ebuild
@@ -34,10 +34,9 @@ RESTRICT="
        !test? ( test )
 "
 
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
+LLVM_MAX_SLOT=${SLOT%%.*}
 DEPEND="
-       >=sys-devel/llvm-6
+       sys-devel/llvm:${LLVM_MAX_SLOT}
        virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
 "
 BDEPEND="
@@ -47,7 +46,7 @@ BDEPEND="
        test? (
                !!<sys-apps/sandbox-2.13
                $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-               =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+               =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}
                sys-libs/compiler-rt:${SLOT}
        )
        !test? (
@@ -160,14 +159,14 @@ src_configure() {
                        -DLLVM_LIT_ARGS="$(get_lit_flags)"
 
                        # they are created during src_test()
-                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
-                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
+                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
+                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
                )
 
                # same flags are passed for build & tests, so we need to strip
                # them down to a subset supported by clang
-               CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
+               CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \
+               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
                strip-unsupported-flags
        fi
 
@@ -194,17 +193,17 @@ src_configure() {
 
                # copy clang over since resource_dir is located relatively to 
binary
                # therefore, we can put our new libraries in it
-               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include}
 || die
-               cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
-                       "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
+               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include}
 || die
+               cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \
+                       "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die
                cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
                        "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
                cp "${sys_dir}"/*builtins*.a \
                        "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || 
die
                # we also need LLVMgold.so for gold-based tests
-               if [[ -f 
${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
-                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
-                               
"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
+               if [[ -f 
${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \
+                               
"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die
                fi
        fi
 }

diff --git 
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild 
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild
index 0583125b7515..f716dc74b423 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild
@@ -34,10 +34,9 @@ RESTRICT="
        !test? ( test )
 "
 
-CLANG_SLOT=${SLOT%%.*}
-# llvm-6 for new lit options
+LLVM_MAX_SLOT=${SLOT%%.*}
 DEPEND="
-       >=sys-devel/llvm-6
+       sys-devel/llvm:${LLVM_MAX_SLOT}
        virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
 "
 BDEPEND="
@@ -47,7 +46,7 @@ BDEPEND="
        test? (
                !!<sys-apps/sandbox-2.13
                $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-               =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+               =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}
                sys-libs/compiler-rt:${SLOT}
        )
        !test? (
@@ -160,14 +159,14 @@ src_configure() {
                        -DLLVM_LIT_ARGS="$(get_lit_flags)"
 
                        # they are created during src_test()
-                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
-                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
+                       
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
+                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
                )
 
                # same flags are passed for build & tests, so we need to strip
                # them down to a subset supported by clang
-               CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
+               CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \
+               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
                strip-unsupported-flags
        fi
 
@@ -194,17 +193,17 @@ src_configure() {
 
                # copy clang over since resource_dir is located relatively to 
binary
                # therefore, we can put our new libraries in it
-               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include}
 || die
-               cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
-                       "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
+               mkdir -p 
"${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include}
 || die
+               cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \
+                       "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die
                cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
                        "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
                cp "${sys_dir}"/*builtins*.a \
                        "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || 
die
                # we also need LLVMgold.so for gold-based tests
-               if [[ -f 
${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
-                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
-                               
"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
+               if [[ -f 
${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+                       ln -s 
"${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \
+                               
"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die
                fi
        fi
 }

Reply via email to