sys-devel/llvm: Backport clang-cpp symlink, #478810

diff --git a/sys-devel/llvm/llvm-3.9.0.ebuild b/sys-devel/llvm/llvm-3.9.0.ebuild
index 4514dd0c239a608015cd722d931604d3b058ad2f..3f694d16fc60ceb911dda98818cb8d1579f907c1 100644 (file)
--- a/sys-devel/llvm/llvm-3.9.0.ebuild
+++ b/sys-devel/llvm/llvm-3.9.0.ebuild
@@ -436,20 +436,20 @@ src_install() {
        if use clang; then
                # Apply CHOST and version suffix to clang tools
                local clang_version=${PV%.*}
-               local clang_tools=( clang clang++ clang-cl )
+               local clang_tools=( clang clang++ clang-cl clang-cpp )
                local abi i
 
                # cmake gives us:
                # - clang-X.Y
                # - clang -> clang-X.Y
-               # - clang++, clang-cl -> clang
+               # - clang++, clang-cl, clang-cpp -> clang
                # we want to have:
                # - clang-X.Y
-               # - clang++-X.Y, clang-cl-X.Y -> clang-X.Y
-               # - clang, clang++, clang-cl -> 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
                # also in CHOST variant
                for i in "${clang_tools[@]:1}"; do
-                       rm "${ED%/}/usr/bin/${i}" || die
+                       rm -f "${ED%/}/usr/bin/${i}" || die
                        dosym "clang-${clang_version}" "/usr/bin/${i}-${clang_version}"
                        dosym "${i}-${clang_version}" "/usr/bin/${i}"
                done