diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-12-20 21:01:50 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-12-20 21:01:50 +0000 |
| commit | bacf520c0c3658b42d4ccd796d5eb23feb358359 (patch) | |
| tree | f15c188b889f21a09e4da7634146d9d3f67d6528 /eclass | |
| parent | stable x86 wrt #435896 (diff) | |
| download | gentoo-2-bacf520c0c3658b42d4ccd796d5eb23feb358359.tar.gz gentoo-2-bacf520c0c3658b42d4ccd796d5eb23feb358359.tar.bz2 gentoo-2-bacf520c0c3658b42d4ccd796d5eb23feb358359.zip | |
Add fix for nen gnu compiler which use -x as command line arg internally, #445244
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/flag-o-matic.eclass | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index fe6f0909f59e..3e4e1739d7e4 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.570 2012/12/20 06:34:57 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.571 2012/12/20 21:01:50 jlec Exp $ + + 20 Dec 2012; Justin Lecher <jlec@gentoo.org> flag-o-matic.eclass: + Add fix for nen gnu compiler which use -x as command line arg internally, + #445244 20 Dec 2012; Mike Gilbert <floppym@gentoo.org> python.eclass: Remove pypy version mapping table from wrapper scripts. We can add it back if diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 3ee33de4f867..794789f7cf45 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.185 2012/12/03 21:20:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.186 2012/12/20 21:01:50 jlec Exp $ # @ECLASS: flag-o-matic.eclass # @MAINTAINER: @@ -392,8 +392,13 @@ test-flag-PROG() { # use -c so we can test the assembler as well local PROG=$(tc-get${comp}) - ${PROG} "${flag}" -c -o /dev/null -x${lang} - < /dev/null \ - > /dev/null 2>&1 + if $( ${PROG} "${flag}" -c -o /dev/null -x${lang} - < /dev/null > /dev/null 2>&1 ); then + ${PROG} "${flag}" -c -o /dev/null -x${lang} - < /dev/null \ + > /dev/null 2>&1 + else + ${PROG} "${flag}" -c -o /dev/null /dev/null \ + > /dev/null 2>&1 + fi } # @FUNCTION: test-flag-CC |