diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2016-07-07 23:35:23 +0200 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2016-07-07 23:35:23 +0200 |
| commit | b1ffe55112b9d2cf0a5da0ca9835d920618e597c (patch) | |
| tree | cefe831a3e4116f2498613d5362270b16824bb0d /eclass | |
| parent | qt5-build.eclass: don't run gcc version checks if compiler is not gcc (diff) | |
| download | gentoo-b1ffe55112b9d2cf0a5da0ca9835d920618e597c.tar.gz gentoo-b1ffe55112b9d2cf0a5da0ca9835d920618e597c.tar.bz2 gentoo-b1ffe55112b9d2cf0a5da0ca9835d920618e597c.zip | |
qt4-build-multilib.eclass: don't run gcc version checks if compiler is not gcc
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt4-build-multilib.eclass | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 8e20a77fdb64..2a84bc5733c1 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -113,10 +113,13 @@ multilib_src_install_all() { qt4_multilib_src_install_all; } # @DESCRIPTION: # Unpacks the sources. qt4-build-multilib_src_unpack() { - if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ]]; then - ewarn - ewarn "Using a GCC version lower than 4.4 is not supported." - ewarn + if tc-is-gcc; then + if [[ $(gcc-major-version) -lt 4 ]] || \ + [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ]]; then + ewarn + ewarn "Using a GCC version lower than 4.4 is not supported" + ewarn + fi fi if [[ ${PN} == qtwebkit ]]; then @@ -172,7 +175,7 @@ qt4-build-multilib_src_prepare() { if [[ ${PN} == qtdeclarative ]]; then # Bug 551560 # gcc-4.8 ICE with -Os, fixed in 4.9 - if use x86 && [[ $(gcc-version) == 4.8 ]]; then + if use x86 && tc-is-gcc && [[ $(gcc-version) == 4.8 ]]; then replace-flags -Os -O2 fi fi |