[gentoo-commits] proj/gcc-config:master commit in: /

["Mike Frysinger" <vapier@gentoo.org>]

commit:     cfbb9e94ca23c360d5801946e39da29c7d422dfc
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  5 16:42:24 2013 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Jan 12 17:23:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git;a=commit;h=cfbb9e94

gcc-config: prefix: don't bother running ldconfig

In Prefix we're unprivileged (most likely) so don't bother trying to
update ld.so.conf or anything like that.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 gcc-config |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcc-config b/gcc-config
index 89fc32c..8d2347f 100755
--- a/gcc-config
+++ b/gcc-config
@@ -646,8 +646,8 @@ switch_profile() {
 		# Pass all by default
 		awk '!/^(STDCXX_INCDIR|LDPATH|CC|CXX|CTARGET|GCCBITS|GCC_SPECS|GCC_PATH|MULTIOSDIRS)=/ {print $0}' \
 			"${GCC_ENV_D}/${CC_COMP}" >> "${envd}.tmp"
-		if [[ -d ${ROOT}/etc/ld.so.conf.d ]] ; then
-			echo "${MY_LDPATH}" > "${ROOT}"/etc/ld.so.conf.d/05gcc-${CTARGET}.conf
+		if [[ -d ${EROOT}/etc/ld.so.conf.d ]] ; then
+			echo "${MY_LDPATH}" > "${EROOT}"/etc/ld.so.conf.d/05gcc-${CTARGET}.conf
 		else
 			echo "LDPATH=\"${MY_LDPATH}\"" >> "${envd}.tmp"
 		fi
@@ -692,7 +692,7 @@ switch_profile() {
 	   [[ ${FORCE} == "yes" || ${envd_changed} -gt 0 ]]
 	then
 		# in case python is broken ...
-		if ! env-update ; then
+		if [[ -z ${EPREFIX} ]] && ! env-update ; then
 			echo ""
 			ewarn "env-update failed to work properly; making sure ld.so.conf paths"
 			ewarn "are setup properly.  Please rerun gcc-config with the -f option."