Lines 589-598
setup_env() {
Link Here
|
589 |
# Reset CC and CXX to the value at start of emerge |
589 |
# Reset CC and CXX to the value at start of emerge |
590 |
export CC=${glibc__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}} |
590 |
export CC=${glibc__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}} |
591 |
export CXX=${glibc__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}} |
591 |
export CXX=${glibc__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}} |
|
|
592 |
export CPP=${glibc__ORIG_CPP:-${CPP:-$(tc-getCPP ${CTARGET})}} |
592 |
|
593 |
|
593 |
# and make sure glibc__ORIG_CC and glibc__ORIG_CXX is defined now. |
594 |
# and make sure glibc__ORIG_CC and glibc__ORIG_CXX is defined now. |
594 |
export glibc__ORIG_CC=${CC} |
595 |
export glibc__ORIG_CC=${CC} |
595 |
export glibc__ORIG_CXX=${CXX} |
596 |
export glibc__ORIG_CXX=${CXX} |
|
|
597 |
export glibc__ORIG_CPP="${CPP}" |
596 |
|
598 |
|
597 |
if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then |
599 |
if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then |
598 |
export glibc__force_gcc=yes |
600 |
export glibc__force_gcc=yes |
Lines 617-623
setup_env() {
Link Here
|
617 |
einfo "Overriding clang configuration, since it won't work here" |
619 |
einfo "Overriding clang configuration, since it won't work here" |
618 |
|
620 |
|
619 |
export CC="${current_gcc_path}/gcc" |
621 |
export CC="${current_gcc_path}/gcc" |
620 |
export CPP="${current_gcc_path}/cpp" |
622 |
export CPP="${current_gcc_path}/gcc -E" |
621 |
export CXX="${current_gcc_path}/g++" |
623 |
export CXX="${current_gcc_path}/g++" |
622 |
export LD="${current_binutils_path}/ld.bfd" |
624 |
export LD="${current_binutils_path}/ld.bfd" |
623 |
export AR="${current_binutils_path}/ar" |
625 |
export AR="${current_binutils_path}/ar" |
Lines 641-646
setup_env() {
Link Here
|
641 |
|
643 |
|
642 |
export CC="$(tc-getCC ${CTARGET})" |
644 |
export CC="$(tc-getCC ${CTARGET})" |
643 |
export CXX="$(tc-getCXX ${CTARGET})" |
645 |
export CXX="$(tc-getCXX ${CTARGET})" |
|
|
646 |
export CPP="$(tc-getCPP ${CTARGET})" |
644 |
|
647 |
|
645 |
# Always use tuple-prefixed toolchain. For non-native ABI glibc's configure |
648 |
# Always use tuple-prefixed toolchain. For non-native ABI glibc's configure |
646 |
# can't detect them automatically due to ${CHOST} mismatch and fallbacks |
649 |
# can't detect them automatically due to ${CHOST} mismatch and fallbacks |
Lines 657-662
setup_env() {
Link Here
|
657 |
# acts on CC?) |
660 |
# acts on CC?) |
658 |
export glibc__GLIBC_CC=${CC} |
661 |
export glibc__GLIBC_CC=${CC} |
659 |
export glibc__GLIBC_CXX=${CXX} |
662 |
export glibc__GLIBC_CXX=${CXX} |
|
|
663 |
export glibc__GLIBC_CPP=${CPP} |
660 |
|
664 |
|
661 |
export glibc__abi_CFLAGS="$(get_abi_CFLAGS)" |
665 |
export glibc__abi_CFLAGS="$(get_abi_CFLAGS)" |
662 |
|
666 |
|
Lines 672-677
setup_env() {
Link Here
|
672 |
# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548 |
676 |
# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548 |
673 |
export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}" |
677 |
export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}" |
674 |
|
678 |
|
|
|
679 |
export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS}" |
680 |
|
675 |
if is_crosscompile; then |
681 |
if is_crosscompile; then |
676 |
# Assume worst-case bootstrap: glibc is built for the first time |
682 |
# Assume worst-case bootstrap: glibc is built for the first time |
677 |
# with ${CTARGET}-g++ not available yet. We avoid |
683 |
# with ${CTARGET}-g++ not available yet. We avoid |