diff options
| author |   Michael Haubenwallner <haubi@gentoo.org> | 2014-07-28 13:48:20 +0000 |
|---|---|---|
| committer | Michael Haubenwallner <haubi@gentoo.org> | 2014-07-28 13:48:20 +0000 |
| commit | 93ffd33f12303de6a5fef80f8d061b163a34c613 (patch) | |
| tree | cb8f414a9ce83dca21d69cf2bd414757808b0c05 /profiles/prefix | |
| parent | Stable for ppc, wrt bug #512012 (diff) | |
| download | gentoo-2-93ffd33f12303de6a5fef80f8d061b163a34c613.tar.gz gentoo-2-93ffd33f12303de6a5fef80f8d061b163a34c613.tar.bz2 gentoo-2-93ffd33f12303de6a5fef80f8d061b163a34c613.zip | |
(<glibc-2.6) -fgnu89-inline is for C only; allow user to override.
Diffstat (limited to 'profiles/prefix')
| -rw-r--r-- | profiles/prefix/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/prefix/linux/profile.bashrc | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog index a7004c993f8d..df0441a40158 100644 --- a/profiles/prefix/ChangeLog +++ b/profiles/prefix/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for profiles/prefix # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.425 2014/07/09 12:03:53 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.426 2014/07/28 13:48:19 haubi Exp $ + + 28 Jul 2014; Michael Haubenwallner <haubi@gentoo.org> linux/profile.bashrc: + (<glibc-2.6) -fgnu89-inline is for C only; allow user to override. 09 Jul 2014; Michael Haubenwallner <haubi@gentoo.org> linux/profile.bashrc: Enable -fgnu89-inline compiler flag for glibc-2.5 and older, bug#473524. diff --git a/profiles/prefix/linux/profile.bashrc b/profiles/prefix/linux/profile.bashrc index de443f63e9a8..5b6dd65fc13d 100644 --- a/profiles/prefix/linux/profile.bashrc +++ b/profiles/prefix/linux/profile.bashrc @@ -16,10 +16,9 @@ fi if [[ ${EBUILD_PHASE} == setup ]]; then VERS=$(/usr/bin/ldd --version | head -n1 | grep -o ") [0-9]\.[0-9]\+" | cut -d. -f2 ) - if [[ $VERS -lt 6 ]]; then # compare host glibc 2.x to 2.6 - ewarn "Your host glibc is too old; enabling -fgnu89-inline compiler flag. bug 473524" - CFLAGS="${CFLAGS} -fgnu89-inline" - CXXFLAGS="${CXXFLAGS} -fgnu89-inline" + if [[ $VERS -lt 6 && "${CFLAGS} " != *'gnu89-inline '* ]]; then # compare host glibc 2.x to 2.6 + elog "Your host glibc is too old; enabling -fgnu89-inline compiler flag. bug 473524" + CFLAGS="${CFLAGS} -fgnu89-inline" # for C only fi fi |