diff options
| author |   Ned Ludd <solar@gentoo.org> | 2004-06-01 04:28:38 +0000 |
|---|---|---|
| committer | Ned Ludd <solar@gentoo.org> | 2004-06-01 04:28:38 +0000 |
| commit | 85dd55c6ddb2274a32dfd32253785cd643552690 (patch) | |
| tree | 435a2c55bbd47150592eeb5c61ea28c0e6d7b850 | |
| parent | Add gcc-3.4 patch #49304 by Robert Führicht. (diff) | |
| download | gentoo-2-85dd55c6ddb2274a32dfd32253785cd643552690.tar.gz gentoo-2-85dd55c6ddb2274a32dfd32253785cd643552690.tar.bz2 gentoo-2-85dd55c6ddb2274a32dfd32253785cd643552690.zip | |
prevent etexec-flags function from rewriting CFLAGS when not using the hardened compiler. bug #52286
| -rw-r--r-- | eclass/flag-o-matic.eclass | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 8155e18339e2..67468d690025 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.52 2004/05/30 02:55:58 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.53 2004/06/01 04:28:38 solar Exp $ # # Author Bart Verwilst <verwilst@gentoo.org> @@ -274,6 +274,12 @@ get-flag() { return 1 } +has_hardened() { + local cc=${CC:-gcc} + [[ $(${cc%% *} --version 2>&1) == *Hardened* ]] + return $? +} + has_pic() { [ "${CFLAGS/-fPIC}" != "${CFLAGS}" ] && return 0 [ "${CFLAGS/-fpic}" != "${CFLAGS}" ] && return 0 @@ -341,6 +347,10 @@ filter-ldflags() { } etexec-flags() { + # if your not using a hardened compiler you wont need this + # PIC/no-pic kludge in the first place. + has_hardened || return + has_pie || has_pic if [ $? == 0 ] ; then [ -z "`is-flag -fno-pic`" ] && |