Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Wed, 06 Jul 2016 20:53:11
Message-Id: 1467838369.d7c4ed7f9256b3899c64105814669b11f771c30d.kensington@gentoo
1 commit: d7c4ed7f9256b3899c64105814669b11f771c30d
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 6 20:50:11 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 6 20:52:49 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d7c4ed7f
7
8 kde5-functions.eclass: only perform gcc check if gcc is being used
9
10 This used to "work" because gcc-version relied on gcc-config, even if GCC was
11 not the active compiler. gcc-version has since been fixed to always use CC
12 instead.
13
14 eclass/kde5-functions.eclass | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17 diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
18 index ad3034a..a03c2ad 100644
19 --- a/eclass/kde5-functions.eclass
20 +++ b/eclass/kde5-functions.eclass
21 @@ -76,7 +76,7 @@ export KDE_BUILD_TYPE
22 # @DESCRIPTION:
23 # Determine if the current GCC version is acceptable, otherwise die.
24 _check_gcc_version() {
25 - if [[ ${MERGE_TYPE} != binary && -v KDE_GCC_MINIMAL ]]; then
26 + if [[ ${MERGE_TYPE} != binary && -v KDE_GCC_MINIMAL ]] && tc-is-gcc; then
27
28 local version=$(gcc-version)
29 local major=${version%.*}