diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-04-01 23:56:47 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-04-01 23:56:47 +0000 |
commit | 7fb6beb1f352c0b22b47aa88d2fa05c53fdf619f (patch) | |
tree | 21be26b7352b657a8e8fd2f9e310c8000a5679f9 /sys-devel | |
parent | amd64/x86 stable (diff) | |
download | gentoo-2-7fb6beb1f352c0b22b47aa88d2fa05c53fdf619f.tar.gz gentoo-2-7fb6beb1f352c0b22b47aa88d2fa05c53fdf619f.tar.bz2 gentoo-2-7fb6beb1f352c0b22b47aa88d2fa05c53fdf619f.zip |
make sure we only scan /etc/env.d/gcc/ and no subdirs #87528
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-devel')
-rwxr-xr-x | sys-devel/gcc-config/files/gcc-config-1.3.10 | 4 | ||||
-rwxr-xr-x | sys-devel/gcc-config/files/gcc-config-1.3.8 | 4 | ||||
-rwxr-xr-x | sys-devel/gcc-config/files/gcc-config-1.4.0 | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.10 b/sys-devel/gcc-config/files/gcc-config-1.3.10 index 25f2047be420..deb7339d24c4 100755 --- a/sys-devel/gcc-config/files/gcc-config-1.3.10 +++ b/sys-devel/gcc-config/files/gcc-config-1.3.10 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.10,v 1.6 2005/03/19 20:30:01 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.10,v 1.7 2005/04/01 23:56:47 vapier Exp $ trap ":" INT QUIT TSTP @@ -115,7 +115,7 @@ switch_profile() { # compilers for default CHOST will be used to compile stuff, # and thus we want all their lib paths in /etc/ld.so.conf ... get_real_chost - GCC_PROFILES="$(${FIND} "${GCC_ENV_D}" -name "${REAL_CHOST}-*" -a ! -name "${CC_COMP}")" + GCC_PROFILES="$(${FIND} "${GCC_ENV_D}" -name "${REAL_CHOST}-*" -a ! -name "${CC_COMP}" -a -prune)" GCC_PROFILES="${GCC_ENV_D}/${CC_COMP} ${GCC_PROFILES}" # Extract all LDPATH's for our CHOST diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.8 b/sys-devel/gcc-config/files/gcc-config-1.3.8 index 89bf235798f8..d676be24ff2e 100755 --- a/sys-devel/gcc-config/files/gcc-config-1.3.8 +++ b/sys-devel/gcc-config/files/gcc-config-1.3.8 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.8,v 1.9 2005/03/19 20:30:01 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.8,v 1.10 2005/04/01 23:56:47 vapier Exp $ trap ":" INT QUIT TSTP @@ -115,7 +115,7 @@ switch_profile() { # compilers for default CHOST will be used to compile stuff, # and thus we want all their lib paths in /etc/ld.so.conf ... get_real_chost - GCC_PROFILES="$(${FIND} "${GCC_ENV_D}" -name "${REAL_CHOST}-*" -a ! -name "${CC_COMP}")" + GCC_PROFILES="$(${FIND} "${GCC_ENV_D}" -name "${REAL_CHOST}-*" -a ! -name "${CC_COMP}" -a -prune)" GCC_PROFILES="${GCC_ENV_D}/${CC_COMP} ${GCC_PROFILES}" # Extract all LDPATH's for our CHOST diff --git a/sys-devel/gcc-config/files/gcc-config-1.4.0 b/sys-devel/gcc-config/files/gcc-config-1.4.0 index 8b2f44333fd9..dd7c2daffa4c 100755 --- a/sys-devel/gcc-config/files/gcc-config-1.4.0 +++ b/sys-devel/gcc-config/files/gcc-config-1.4.0 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0,v 1.8 2005/03/19 20:30:01 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0,v 1.9 2005/04/01 23:56:47 vapier Exp $ trap ":" INT QUIT TSTP @@ -130,7 +130,7 @@ switch_profile() { # compilers for default CHOST will be used to compile stuff, # and thus we want all their lib paths in /etc/ld.so.conf ... get_real_chost - GCC_PROFILES="$(${FIND} "${GCC_ENV_D}" -name "${REAL_CHOST}-*" -a ! -name "${CC_COMP}")" + GCC_PROFILES="$(${FIND} "${GCC_ENV_D}" -name "${REAL_CHOST}-*" -a ! -name "${CC_COMP}" -a -prune)" GCC_PROFILES="${GCC_ENV_D}/${CC_COMP} ${GCC_PROFILES}" # Extract all LDPATH's for our CHOST |