diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2017-12-15 09:30:17 +0100 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2017-12-15 09:30:17 +0100 |
| commit | 748d20380aa1b27149dc1b80c7eaf15fde7c6aba (patch) | |
| tree | 35a51c23e6afdbbbd228179c4c61ea8dd9b41202 | |
| parent | gcc.eselect: add an eselect module (diff) | |
| download | gcc-config-748d20380aa1b27149dc1b80c7eaf15fde7c6aba.tar.gz gcc-config-748d20380aa1b27149dc1b80c7eaf15fde7c6aba.tar.bz2 gcc-config-748d20380aa1b27149dc1b80c7eaf15fde7c6aba.zip | |
gcc-config: ensure we run env-update for prefix too
The intention of commit cfbb9e94ca23c360d5801946e39da29c7d422dfc was to
disable running ldconfig and updating ld.so.conf for prefix, but the
implementation was too greedy and also disabled env-update, which we
need to activate a compiler, see bug #641096.
Bug: https://bugs.gentoo.org/641096
| -rwxr-xr-x | gcc-config | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -693,16 +693,18 @@ switch_profile() { [[ ${FORCE} == "yes" || ${envd_changed} -gt 0 ]] then # in case python is broken ... - if [[ -z ${EPREFIX} ]] && ! env-update ; then + if ! 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." echo "" - if [[ ! -d /etc/ld.so.conf.d ]] ; then - show_var LDPATH "${ROOT}"/etc/env.d/05gcc-${CTARGET} \ - | ${SED} -e 's|:|\n|g' >> /etc/ld.so.conf + if [[ -z ${EPREFIX} ]] ; then + if [[ ! -d /etc/ld.so.conf.d ]] ; then + show_var LDPATH "${ROOT}"/etc/env.d/05gcc-${CTARGET} \ + | ${SED} -e 's|:|\n|g' >> /etc/ld.so.conf + fi + ldconfig fi - ldconfig fi else envd_changed=0 |