Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/
Date: Sun, 02 Oct 2016 21:51:56
Message-Id: 1475445109.00f67b1579de819d36bd728a1af6e1fa4fca9f4c.mgorny@gentoo
1 commit: 00f67b1579de819d36bd728a1af6e1fa4fca9f4c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 2 21:32:01 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 2 21:51:49 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f67b15
7
8 sys-devel/llvm: Backport clang-cpp symlink, #478810
9
10 sys-devel/llvm/llvm-3.9.0.ebuild | 10 +++++-----
11 1 file changed, 5 insertions(+), 5 deletions(-)
12
13 diff --git a/sys-devel/llvm/llvm-3.9.0.ebuild b/sys-devel/llvm/llvm-3.9.0.ebuild
14 index 4514dd0..3f694d1 100644
15 --- a/sys-devel/llvm/llvm-3.9.0.ebuild
16 +++ b/sys-devel/llvm/llvm-3.9.0.ebuild
17 @@ -436,20 +436,20 @@ src_install() {
18 if use clang; then
19 # Apply CHOST and version suffix to clang tools
20 local clang_version=${PV%.*}
21 - local clang_tools=( clang clang++ clang-cl )
22 + local clang_tools=( clang clang++ clang-cl clang-cpp )
23 local abi i
24
25 # cmake gives us:
26 # - clang-X.Y
27 # - clang -> clang-X.Y
28 - # - clang++, clang-cl -> clang
29 + # - clang++, clang-cl, clang-cpp -> clang
30 # we want to have:
31 # - clang-X.Y
32 - # - clang++-X.Y, clang-cl-X.Y -> clang-X.Y
33 - # - clang, clang++, clang-cl -> clang*-X.Y
34 + # - clang++-X.Y, clang-cl-X.Y, clang-cpp-X.Y -> clang-X.Y
35 + # - clang, clang++, clang-cl, clang-cpp -> clang*-X.Y
36 # also in CHOST variant
37 for i in "${clang_tools[@]:1}"; do
38 - rm "${ED%/}/usr/bin/${i}" || die
39 + rm -f "${ED%/}/usr/bin/${i}" || die
40 dosym "clang-${clang_version}" "/usr/bin/${i}-${clang_version}"
41 dosym "${i}-${clang_version}" "/usr/bin/${i}"
42 done