diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2013-01-05 17:42:24 +0100 |
|---|---|---|
| committer |   Mike Frysinger <vapier@gentoo.org> | 2013-01-12 12:23:25 -0500 |
| commit | cfbb9e94ca23c360d5801946e39da29c7d422dfc (patch) | |
| tree | e925e292854b0039588c67ea59dda502253b2086 | |
| parent | gcc-config: prefix: copy GCC's libs to emulate ld.so.conf magic (diff) | |
| download | gcc-config-cfbb9e94ca23c360d5801946e39da29c7d422dfc.tar.gz gcc-config-cfbb9e94ca23c360d5801946e39da29c7d422dfc.tar.bz2 gcc-config-cfbb9e94ca23c360d5801946e39da29c7d422dfc.zip | |
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@gentoo.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| -rwxr-xr-x | gcc-config | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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." |