diff options
| author |   Kevin F. Quinn <kevquinn@gentoo.org> | 2007-03-15 22:08:23 +0000 |
|---|---|---|
| committer | Kevin F. Quinn <kevquinn@gentoo.org> | 2007-03-15 22:08:23 +0000 |
| commit | b95dc1e197e882e42dca7b29e2df674fad8c7f20 (patch) | |
| tree | cc3d27a806d28ef8d14adcbf72719190a1430c0d | |
| parent | Cosmetic alignment with gentoo-x86 (diff) | |
| download | kevquinn-b95dc1e197e882e42dca7b29e2df674fad8c7f20.tar.gz kevquinn-b95dc1e197e882e42dca7b29e2df674fad8c7f20.tar.bz2 kevquinn-b95dc1e197e882e42dca7b29e2df674fad8c7f20.zip | |
More cosmetic alignment with gentoo-x86
svn path=/; revision=196
| -rw-r--r-- | hardened/toolchain/branches/pieworld/eclass/toolchain-funcs.eclass | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/hardened/toolchain/branches/pieworld/eclass/toolchain-funcs.eclass b/hardened/toolchain/branches/pieworld/eclass/toolchain-funcs.eclass index bbc57b5..c3e8bd6 100644 --- a/hardened/toolchain/branches/pieworld/eclass/toolchain-funcs.eclass +++ b/hardened/toolchain/branches/pieworld/eclass/toolchain-funcs.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.67 2007/03/04 21:03:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.68 2007/03/15 15:55:59 kevquinn Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> # @@ -204,7 +204,8 @@ _gcc-specs-exists() { [[ -f $(_gcc-install-dir)/$1 ]] } -# Returns requested gcc specs directive +# Returns requested gcc specs directive unprocessed - for used by +# gcc-specs-directive() # Note; later specs normally overwrite earlier ones; however if a later # spec starts with '+' then it appends. # gcc -dumpspecs is parsed first, followed by files listed by "gcc -v" @@ -213,7 +214,7 @@ _gcc-specs-exists() { # the same token anything from 'gcc -dumpspecs' is overridden by # the contents of $(gcc_install_dir)/specs so the result is the # same either way. -gcc-specs-directive_raw() { +_gcc-specs-directive_raw() { local cc=$(tc-getCC) local specfiles=$(LC_ALL=C ${cc} -v 2>&1 | awk '$1=="Reading" {print $NF}') ${cc} -dumpspecs 2> /dev/null | cat - ${specfiles} | awk -v directive=$1 \ @@ -233,11 +234,11 @@ END { print spec }' # assuming gcc is operational. gcc-specs-directive() { local directive subdname subdirective - directive="$(gcc-specs-directive_raw $1)" + directive="$(_gcc-specs-directive_raw $1)" while [[ ${directive} == *%\(*\)* ]]; do subdname=${directive/*%\(} subdname=${subdname/\)*} - subdirective="$(gcc-specs-directive_raw ${subdname})" + subdirective="$(_gcc-specs-directive_raw ${subdname})" directive="${directive//\%(${subdname})/${subdirective}}" done echo "${directive}" |