Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Mon, 26 Oct 2020 11:50:10
Message-Id: 1603712949.c87ecd828f4b4de9ba80c32d3eaf19bfcfc6deea.grobian@gentoo
1 commit: c87ecd828f4b4de9ba80c32d3eaf19bfcfc6deea
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 26 11:49:09 2020 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 26 11:49:09 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c87ecd82
7
8 scripts/bootstrap-prefix.sh: add detection support for newer Apple clang
9
10 Thanks Alexander Bezrukov for an initial patch. I went with a slightly
11 different approach, to be a bit more specific and hopefully not match
12 something unexpected in the future.
13
14 Closes: https://bugs.gentoo.org/751067
15 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
16
17 scripts/bootstrap-prefix.sh | 17 +++++++++++++++++
18 1 file changed, 17 insertions(+)
19
20 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
21 index 313139c0e8..559eb3a356 100755
22 --- a/scripts/bootstrap-prefix.sh
23 +++ b/scripts/bootstrap-prefix.sh
24 @@ -222,6 +222,23 @@ configure_toolchain() {
25 local ccvers="$( (unset CHOST; gcc --version 2>/dev/null) )"
26 local mycc=
27 case "${ccvers}" in
28 + *"Apple clang version "*)
29 + vers=${ccvers#*Apple clang version }
30 + vers=${vers% (clang-*}
31 + # this is Clang, recent enough to compile recent clang
32 + mycc=clang
33 + compiler_stage1+="
34 + ${llvm_deps}
35 + sys-devel/llvm
36 + sys-devel/clang
37 + sys-libs/libcxxabi
38 + sys-libs/libcxx"
39 + ;;
40 + esac
41 + CC=clang
42 + CXX=clang++
43 + linker=sys-devel/binutils-apple
44 + ;;
45 *"Apple LLVM version "*)
46 vers=${ccvers#*Apple LLVM version }
47 vers=${vers% (clang-*}