summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2004-01-20 10:37:19 +0000
committerNed Ludd <solar@gentoo.org>2004-01-20 10:37:19 +0000
commit42591b473f3e9617f5e4d3f8aaf6526af00b7d68 (patch)
treebeee95d27a6d2f45e1395d0da5d7e7ade00337af /eclass/flag-o-matic.eclass
parentCurrent version on CPAN; tested on sparc and x86 (diff)
downloadgentoo-2-42591b473f3e9617f5e4d3f8aaf6526af00b7d68.tar.gz
gentoo-2-42591b473f3e9617f5e4d3f8aaf6526af00b7d68.tar.bz2
gentoo-2-42591b473f3e9617f5e4d3f8aaf6526af00b7d68.zip
eclass syntax cleanups for when filtering -fPIC, -fpic, -fPIE, -fpie, -fstack-protector and -fstack-protector-all
Diffstat (limited to 'eclass/flag-o-matic.eclass')
-rw-r--r--eclass/flag-o-matic.eclass20
1 files changed, 11 insertions, 9 deletions
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 965478d11aed..84b541e799e4 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.34 2004/01/14 20:32:41 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.35 2004/01/20 10:37:19 solar Exp $
#
# Author Bart Verwilst <verwilst@gentoo.org>
@@ -256,22 +256,24 @@ append-ldflags() {
return 0
}
-etexec-flags() {
- has_version 'sys-devel/hardened-gcc' && {
- if [ ! is-flag -yet_exec ]; then
- debug-print ">>> appending flags -yet_exec"
+etexec-flags() {
+ has_version sys-devel/hardened-gcc
+ if [ $? == 0 ]; then
+ if [ "`is-flag -yet_exec`" != "true" ]; then
+ debug-print ">>> appending flags -yet_exec"
append-flags -yet_exec
append-ldflags -yet_exec
fi
- }
+ fi
}
fstack-flags() {
- has_version 'sys-devel/hardened-gcc' && {
- if [ ! is-flag -yno_propolice ]; then
+ has_version sys-devel/hardened-gcc
+ if [ $? == 0 ]; then
+ if [ "`is-flag -yno_propolice`" != "true" ]; then
debug-print ">>> appending flags -yno_propolice"
append-flags -yno_propolice
append-ldflags -yno_propolice
fi
- }
+ fi
}