sys-libs/compiler-rt-sanitizers: Fix LLVM_MAX_SLOT -> CLANG_SLOT

The variable was intentionally chosen not to use the eclass, and its
my mistake of conflating the two. Name it CLANG_SLOT to make it look
more purposeful.

Closes: https://bugs.gentoo.org/650750
Fixes: e5afd9d0759d (sys-libs/compiler-rt-sanitizers: LLVM_SLOT -> ...)

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
index 632e36150ded813bbc1a21840730b7f3ab99ccfc..2dc0d7cb40bd335c292d114808d58376041cb795 100644 (file)
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
@@ -21,7 +21,7 @@ SLOT="${PV%_*}"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE="+clang test"
 
-LLVM_MAX_SLOT=${SLOT%%.*}
+CLANG_SLOT=${SLOT%%.*}
 RDEPEND="!=sys-libs/compiler-rt-sanitizers-${SLOT}*:0"
 # llvm-4 needed for --cmakedir
 DEPEND="
@@ -30,7 +30,7 @@ DEPEND="
        test? (
                app-portage/unsandbox
                $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-               =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}
+               =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
                sys-libs/compiler-rt:${SLOT} )
        ${PYTHON_DEPS}"
 
@@ -111,14 +111,14 @@ src_configure() {
                        -DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit"
 
                        # they are created during src_test()
-                       -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++"
+                       -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++"
                )
 
                # 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/${LLVM_MAX_SLOT}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
+               CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
+               CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
                strip-unsupported-flags
        fi
 
@@ -131,17 +131,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/${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
+               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
                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/${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
+               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
                fi
        fi
 }

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild
index db4e4d049b525be7c4cb1c3743d51b9cb8564eed..b09a0573d92a225f90874e87495f1f0774c58afa 100644 (file)
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild
@@ -23,7 +23,7 @@ SLOT="${PV%_*}"
 KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test elibc_glibc"
 
-LLVM_MAX_SLOT=${SLOT%%.*}
+CLANG_SLOT=${SLOT%%.*}
 # llvm-4 needed for --cmakedir
 DEPEND="
        >=sys-devel/llvm-4
@@ -31,7 +31,7 @@ DEPEND="
        test? (
                app-portage/unsandbox
                $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
-               =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}
+               =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
                sys-libs/compiler-rt:${SLOT} )
        ${PYTHON_DEPS}"
 
@@ -115,14 +115,14 @@ src_configure() {
                        -DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit"
 
                        # they are created during src_test()
-                       -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++"
+                       -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++"
                )
 
                # 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/${LLVM_MAX_SLOT}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
+               CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
+               CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
                strip-unsupported-flags
        fi
 
@@ -142,17 +142,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/${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
+               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
                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/${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
+               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
                fi
        fi
 }

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild
index ca7cb14d19fc596a9d71ec1c7d58b2e32dcf395f..cb0a84d01c62b804577388d72a1c5e79e54a67a2 100644 (file)
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86
 IUSE="+clang test elibc_glibc"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
-LLVM_MAX_SLOT=${SLOT%%.*}
+CLANG_SLOT=${SLOT%%.*}
 # llvm-6 for new lit options
 DEPEND="
        >=sys-devel/llvm-6
@@ -33,7 +33,7 @@ DEPEND="
        test? (
                !<sys-apps/sandbox-2.13
                $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
-               =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}
+               =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
                sys-libs/compiler-rt:${SLOT} )
        ${PYTHON_DEPS}"
 
@@ -116,14 +116,14 @@ src_configure() {
                        -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
 
                        # they are created during src_test()
-                       -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++"
+                       -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++"
                )
 
                # 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/${LLVM_MAX_SLOT}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
+               CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
+               CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
                strip-unsupported-flags
        fi
 
@@ -143,17 +143,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/${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
+               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
                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/${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
+               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
                fi
        fi
 }

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild
index 52cda5eedce61604129797dd4b98b00a472f729f..c9bd5cbb5820c42b524a58f0188ff36338f40ac0 100644 (file)
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild
@@ -25,7 +25,7 @@ KEYWORDS=""
 IUSE="+clang test elibc_glibc"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
-LLVM_MAX_SLOT=${SLOT%%.*}
+CLANG_SLOT=${SLOT%%.*}
 # llvm-6 for new lit options
 DEPEND="
        >=sys-devel/llvm-6
@@ -33,7 +33,7 @@ DEPEND="
        test? (
                !<sys-apps/sandbox-2.13
                $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
-               =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}
+               =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
                sys-libs/compiler-rt:${SLOT} )
        ${PYTHON_DEPS}"
 
@@ -117,14 +117,14 @@ src_configure() {
                        -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
 
                        # they are created during src_test()
-                       -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++"
+                       -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++"
                )
 
                # 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/${LLVM_MAX_SLOT}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
+               CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
+               CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
                strip-unsupported-flags
        fi
 
@@ -144,17 +144,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/${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
+               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
                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/${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
+               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
                fi
        fi
 }

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
index b232680519be2c7e53ff829f1096d546d28cad56..8b127c7f41aac1e9e25c3308a8c0ad6dddefacfd 100644 (file)
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
@@ -24,7 +24,7 @@ KEYWORDS=""
 IUSE="+clang test elibc_glibc"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
-LLVM_MAX_SLOT=${SLOT%%.*}
+CLANG_SLOT=${SLOT%%.*}
 # llvm-6 for new lit options
 DEPEND="
        >=sys-devel/llvm-6
@@ -32,7 +32,7 @@ DEPEND="
        test? (
                !<sys-apps/sandbox-2.13
                $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
-               =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}
+               =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
                sys-libs/compiler-rt:${SLOT} )
        ${PYTHON_DEPS}"
 
@@ -116,14 +116,14 @@ src_configure() {
                        -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
 
                        # they are created during src_test()
-                       -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++"
+                       -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++"
                )
 
                # 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/${LLVM_MAX_SLOT}/bin/clang \
-               CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
+               CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
+               CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
                strip-unsupported-flags
        fi
 
@@ -143,17 +143,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/${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
+               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
                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/${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
+               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
                fi
        fi
 }