From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 65070138010 for ; Tue, 30 Oct 2012 20:20:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34C9C21C0AF; Tue, 30 Oct 2012 20:20:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9B50D21C0AF for ; Tue, 30 Oct 2012 20:20:39 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C88CA33D924 for ; Tue, 30 Oct 2012 20:20:38 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 8DBF721600; Tue, 30 Oct 2012 20:20:37 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: flag-o-matic.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: flag-o-matic.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20121030202037.8DBF721600@flycatcher.gentoo.org> Date: Tue, 30 Oct 2012 20:20:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4e1bb7bc-14ca-42cd-a1ff-7972809a6151 X-Archives-Hash: 27b851a9ac068d3a265fb3fbc007fcfa 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