|
Line
Link Here
|
| 0 |
-- gcc-config |
0 |
++ gcc-config |
|
Lines 115-120
Link Here
|
| 115 |
fi |
115 |
fi |
| 116 |
} |
116 |
} |
| 117 |
|
117 |
|
|
|
118 |
get_chost_paludis() { |
| 119 |
local varname=${1:-CHOST} |
| 120 |
local conf=$(cave print-environment-metadata --raw-name conf_dir --format "%v")/bashrc |
| 121 |
local ret=$(source "${conf}" 2>/dev/null ; echo ${!varname}) |
| 122 |
|
| 123 |
if [[ -n ${ret} ]] ; then |
| 124 |
echo ${ret} |
| 125 |
return 0 |
| 126 |
fi |
| 127 |
} |
| 128 |
|
| 118 |
get_chost() { |
129 |
get_chost() { |
| 119 |
# If it's set in the env, trust the setting. If it's wrong, |
130 |
# If it's set in the env, trust the setting. If it's wrong, |
| 120 |
# then that's the caller's problem. |
131 |
# then that's the caller's problem. |
|
Lines 122-127
Link Here
|
| 122 |
|
133 |
|
| 123 |
export CHOST |
134 |
export CHOST |
| 124 |
|
135 |
|
|
|
136 |
# check for paludis |
| 137 |
if [[ ${PACKAGE_MANAGER} == paludis ]]; then |
| 138 |
CHOST=$(get_chost_paludis) |
| 139 |
return 0 |
| 140 |
fi |
| 141 |
|
| 125 |
# make sure portage isnt broken |
142 |
# make sure portage isnt broken |
| 126 |
if python -V &>/dev/null ; then |
143 |
if python -V &>/dev/null ; then |
| 127 |
CHOST=$(portageq envvar CHOST 2>/dev/null) |
144 |
CHOST=$(portageq envvar CHOST 2>/dev/null) |
|
Lines 453-461
Link Here
|
| 453 |
[[ ${FORCE} == "yes" || ${envd_changed} -gt 0 ]] |
470 |
[[ ${FORCE} == "yes" || ${envd_changed} -gt 0 ]] |
| 454 |
then |
471 |
then |
| 455 |
# in case python is broken ... |
472 |
# in case python is broken ... |
| 456 |
if ! env-update ; then |
473 |
if [[ -x /usr/bin/env-update ]]; then |
|
|
474 |
ENV_UPDATE_COMMAND="env-update" |
| 475 |
else |
| 476 |
ENV_UPDATE_COMMAND="eselect env update" |
| 477 |
fi |
| 478 |
|
| 479 |
if ! ${ENV_UPDATE_COMMAND} ; then |
| 457 |
echo "" |
480 |
echo "" |
| 458 |
ewarn "env-update failed to work properly; making sure ld.so.conf paths" |
481 |
ewarn "${ENV_UPDATE_COMMAND} failed to work properly; making sure ld.so.conf paths" |
| 459 |
ewarn "are setup properly. Please rerun gcc-config with the -f option." |
482 |
ewarn "are setup properly. Please rerun gcc-config with the -f option." |
| 460 |
echo "" |
483 |
echo "" |
| 461 |
if [[ ! -d /etc/ld.so.conf.d ]] ; then |
484 |
if [[ ! -d /etc/ld.so.conf.d ]] ; then |
