[gentoo-commits] gentoo-x86 commit in eclass: flag-o-matic.eclass

[Mike Frysinger (vapier)]

vapier      12/10/30 20:20:37

  Modified:             flag-o-matic.eclass
  Log:
  strip-flags: do not add -O2 if user has -O #440306 by Denis M

Revision  Changes    Path
1.178                eclass/flag-o-matic.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?rev=1.178&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?rev=1.178&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?r1=1.177&r2=1.178

Index: flag-o-matic.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- flag-o-matic.eclass	23 Jun 2012 22:21:50 -0000	1.177
+++ flag-o-matic.eclass	30 Oct 2012 20:20:37 -0000	1.178
@@ -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 @@
 		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