summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-10-30 20:20:37 +0000
committerMike Frysinger <vapier@gentoo.org>2012-10-30 20:20:37 +0000
commit582ff0bb95fdce25b33ae786a409cd3e812c9b2b (patch)
treeaf688787448bf33eda941a704ffbb11b880d197c /eclass
parentCleanup (diff)
downloadgentoo-2-582ff0bb95fdce25b33ae786a409cd3e812c9b2b.tar.gz
gentoo-2-582ff0bb95fdce25b33ae786a409cd3e812c9b2b.tar.bz2
gentoo-2-582ff0bb95fdce25b33ae786a409cd3e812c9b2b.zip
strip-flags: do not add -O2 if user has -O #440306 by Denis M
Diffstat (limited to 'eclass')
-rw-r--r--eclass/flag-o-matic.eclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 5ad51225eb99..d50c9d397675 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.177 2012/06/23 22:21:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.178 2012/10/30 20:20:37 vapier Exp $
# @ECLASS: flag-o-matic.eclass
# @MAINTAINER:
@@ -370,7 +370,7 @@ strip-flags() {
done
# In case we filtered out all optimization flags fallback to -O2
- if _is_flagq ${var} "-O*" && ! _is_flagq new "-O*" ; then
+ if _is_flagq ${var} "-O*" && ! (_is_flagq new "-O*" || _is_flagq new -O) ; then
new+=( -O2 )
fi