diff options
Diffstat (limited to 'sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild')
| -rw-r--r-- | sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild index 8808e083b283..f7a4ef2ed66f 100644 --- a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild @@ -20,13 +20,13 @@ SLOT="${PV%_*}" KEYWORDS="amd64 ~arm64 x86" IUSE="+clang test" -LLVM_SLOT=${SLOT%%.*} +LLVM_MAX_SLOT=${SLOT%%.*} RDEPEND="!=sys-libs/compiler-rt-${SLOT}*:0" # llvm-4 needed for --cmakedir DEPEND=" >=sys-devel/llvm-4 clang? ( sys-devel/clang ) - test? ( =sys-devel/clang-${PV%_*}*:${LLVM_SLOT} ) + test? ( =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} ) ${PYTHON_DEPS}" S=${WORKDIR}/${P/_/}.src @@ -88,9 +88,9 @@ src_test() { # prepare a test compiler # 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_SLOT}{/bin,$(get_libdir)},clang/${SLOT}/include} || die - cp "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/bin/clang{,++} \ - "${BUILD_DIR}"/lib/llvm/${LLVM_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 @@ -128,7 +128,7 @@ src_test() { einfo "Running tests for ABI=${ABI}" # use -k to run all tests even if some fail emake -k \ - CC="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang" \ + CC="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" \ CFLAGS="$(get_abi_CFLAGS)" \ CPPFLAGS='-I../../../lib/builtins' \ LDFLAGS='-rtlib=compiler-rt' \ |