|
Line
Link Here
|
| 0 |
-- eclass/multilib.eclass |
0 |
++ eclass/multilib.eclass |
|
Lines 397-403
Link Here
|
| 397 |
if [[ ${__DEFAULT_ABI_SAVED} == "true" ]] ; then |
397 |
if [[ ${__DEFAULT_ABI_SAVED} == "true" ]] ; then |
| 398 |
for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do |
398 |
for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do |
| 399 |
vv="__abi_saved_${v}" |
399 |
vv="__abi_saved_${v}" |
| 400 |
export ${v}="${!vv}" |
400 |
# preserve unset variables |
|
|
401 |
if [[ ${!vv} == "__unset__" ]] ; then |
| 402 |
unset ${v} |
| 403 |
else |
| 404 |
export ${v}="${!vv}" |
| 405 |
fi |
| 401 |
unset ${vv} |
406 |
unset ${vv} |
| 402 |
done |
407 |
done |
| 403 |
unset __DEFAULT_ABI_SAVED |
408 |
unset __DEFAULT_ABI_SAVED |
|
Lines 408-414
Link Here
|
| 408 |
if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then |
413 |
if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then |
| 409 |
# Back that multilib-ass up so we can restore it later |
414 |
# Back that multilib-ass up so we can restore it later |
| 410 |
for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do |
415 |
for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do |
| 411 |
export __abi_saved_${v}="${!v}" |
416 |
# preserve unset variables |
|
|
417 |
if [[ -z ${!v+x} ]] ; then |
| 418 |
export __abi_saved_${v}="__unset__" |
| 419 |
else |
| 420 |
export __abi_saved_${v}="${!v}" |
| 421 |
fi |
| 412 |
done |
422 |
done |
| 413 |
export __DEFAULT_ABI_SAVED="true" |
423 |
export __DEFAULT_ABI_SAVED="true" |
| 414 |
|
424 |
|
