From c5a58952083aa9392b1944ec73942494a2440198 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 7 Apr 2018 23:04:52 +0200 Subject: [PATCH] sys-devel/clang: Update for clang-X naming in -9999 Upstream has removed the minor version from clang symlink in git. Update our code accordingly. --- sys-devel/clang/clang-9999.ebuild | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild index 8bc9b08cc459..0ece5c802161 100644 --- a/sys-devel/clang/clang-9999.ebuild +++ b/sys-devel/clang/clang-9999.ebuild @@ -219,19 +219,19 @@ src_install() { # Apply CHOST and version suffix to clang tools # note: we use two version components here (vs 3 in runtime path) local llvm_version=$(llvm-config --version) || die - local clang_version=$(ver_cut 1-2 "${llvm_version}") + local clang_version=$(ver_cut 1 "${llvm_version}") local clang_full_version=$(ver_cut 1-3 "${llvm_version}") local clang_tools=( clang clang++ clang-cl clang-cpp ) local abi i # cmake gives us: - # - clang-X.Y - # - clang -> clang-X.Y + # - clang-X + # - clang -> clang-X # - clang++, clang-cl, clang-cpp -> clang # we want to have: - # - clang-X.Y - # - clang++-X.Y, clang-cl-X.Y, clang-cpp-X.Y -> clang-X.Y - # - clang, clang++, clang-cl, clang-cpp -> clang*-X.Y + # - clang-X + # - clang++-X, clang-cl-X, clang-cpp-X -> clang-X + # - clang, clang++, clang-cl, clang-cpp -> clang*-X # also in CHOST variant for i in "${clang_tools[@]:1}"; do rm "${ED%/}/usr/lib/llvm/${SLOT}/bin/${i}" || die -- 2.26.2