|
Lines 395-401
multilib_toolchain_setup() {
Link Here
|
| 395 |
|
395 |
|
| 396 |
# First restore any saved state we have laying around. |
396 |
# First restore any saved state we have laying around. |
| 397 |
if [[ ${__DEFAULT_ABI_SAVED} == "true" ]] ; then |
397 |
if [[ ${__DEFAULT_ABI_SAVED} == "true" ]] ; then |
| 398 |
for v in CHOST CBUILD AS CC CXX LD ; 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 |
export ${v}="${!vv}" |
| 401 |
unset ${vv} |
401 |
unset ${vv} |
|
Lines 407-413
multilib_toolchain_setup() {
Link Here
|
| 407 |
# screws up ccache and distcc. See #196243 for more info. |
407 |
# screws up ccache and distcc. See #196243 for more info. |
| 408 |
if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then |
408 |
if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then |
| 409 |
# Back that multilib-ass up so we can restore it later |
409 |
# Back that multilib-ass up so we can restore it later |
| 410 |
for v in CHOST CBUILD AS CC CXX LD ; do |
410 |
for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do |
| 411 |
export __abi_saved_${v}="${!v}" |
411 |
export __abi_saved_${v}="${!v}" |
| 412 |
done |
412 |
done |
| 413 |
export __DEFAULT_ABI_SAVED="true" |
413 |
export __DEFAULT_ABI_SAVED="true" |
|
Lines 420-425
multilib_toolchain_setup() {
Link Here
|
| 420 |
export LD="$(tc-getLD) $(get_abi_LDFLAGS)" |
420 |
export LD="$(tc-getLD) $(get_abi_LDFLAGS)" |
| 421 |
export CHOST=$(get_abi_CHOST $1) |
421 |
export CHOST=$(get_abi_CHOST $1) |
| 422 |
export CBUILD=$(get_abi_CHOST $1) |
422 |
export CBUILD=$(get_abi_CHOST $1) |
|
|
423 |
export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig |
| 424 |
export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig |
| 423 |
fi |
425 |
fi |
| 424 |
} |
426 |
} |
| 425 |
|
427 |
|
| 426 |
- |
|
|
