mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-04 13:47:35 -08:00
sys-libs/glibc: Ignore multilib check when cross-compiling
is_crosscompile only covers the case where the libc is being built for a cross compiler (CHOST != CTARGET), but not the case when it's built *with* a cross compiler (CBUILD != CHOST). Closes: https://bugs.gentoo.org/962756 Signed-off-by: Esteve Varela Colominas <esteve.varela@gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43746 Closes: https://github.com/gentoo/gentoo/pull/43746 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
parent
200b2d7aeb
commit
231dfc5655
@ -616,7 +616,7 @@ sanity_prechecks() {
|
||||
|
||||
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
|
||||
# we test for...
|
||||
if ! is_crosscompile ; then
|
||||
if ! is_crosscompile && ! tc-is-cross-compiler ; then
|
||||
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
|
||||
ebegin "Checking if the system can execute 32-bit binaries"
|
||||
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
|
||||
|
||||
@ -652,7 +652,7 @@ sanity_prechecks() {
|
||||
|
||||
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
|
||||
# we test for...
|
||||
if ! is_crosscompile ; then
|
||||
if ! is_crosscompile && ! tc-is-cross-compiler ; then
|
||||
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
|
||||
ebegin "Checking if the system can execute 32-bit binaries"
|
||||
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
|
||||
|
||||
@ -669,7 +669,7 @@ sanity_prechecks() {
|
||||
|
||||
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
|
||||
# we test for...
|
||||
if ! is_crosscompile ; then
|
||||
if ! is_crosscompile && ! tc-is-cross-compiler ; then
|
||||
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
|
||||
ebegin "Checking if the system can execute 32-bit binaries"
|
||||
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
|
||||
|
||||
@ -738,7 +738,7 @@ sanity_prechecks() {
|
||||
|
||||
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
|
||||
# we test for...
|
||||
if ! is_crosscompile ; then
|
||||
if ! is_crosscompile && ! tc-is-cross-compiler ; then
|
||||
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
|
||||
ebegin "Checking if the system can execute 32-bit binaries"
|
||||
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
|
||||
|
||||
@ -747,7 +747,7 @@ sanity_prechecks() {
|
||||
|
||||
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
|
||||
# we test for...
|
||||
if ! is_crosscompile ; then
|
||||
if ! is_crosscompile && ! tc-is-cross-compiler ; then
|
||||
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
|
||||
ebegin "Checking if the system can execute 32-bit binaries"
|
||||
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
|
||||
|
||||
@ -766,7 +766,7 @@ sanity_prechecks() {
|
||||
|
||||
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
|
||||
# we test for...
|
||||
if ! is_crosscompile ; then
|
||||
if ! is_crosscompile && ! tc-is-cross-compiler ; then
|
||||
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
|
||||
ebegin "Checking if the system can execute 32-bit binaries"
|
||||
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
|
||||
|
||||
@ -797,7 +797,7 @@ sanity_prechecks() {
|
||||
|
||||
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
|
||||
# we test for...
|
||||
if ! is_crosscompile ; then
|
||||
if ! is_crosscompile && ! tc-is-cross-compiler ; then
|
||||
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
|
||||
ebegin "Checking if the system can execute 32-bit binaries"
|
||||
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
|
||||
|
||||
@ -806,7 +806,7 @@ sanity_prechecks() {
|
||||
|
||||
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
|
||||
# we test for...
|
||||
if ! is_crosscompile ; then
|
||||
if ! is_crosscompile && ! tc-is-cross-compiler ; then
|
||||
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
|
||||
ebegin "Checking if the system can execute 32-bit binaries"
|
||||
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
|
||||
|
||||
@ -817,7 +817,7 @@ sanity_prechecks() {
|
||||
|
||||
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
|
||||
# we test for...
|
||||
if ! is_crosscompile ; then
|
||||
if ! is_crosscompile && ! tc-is-cross-compiler ; then
|
||||
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
|
||||
ebegin "Checking if the system can execute 32-bit binaries"
|
||||
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
|
||||
|
||||
@ -838,7 +838,7 @@ sanity_prechecks() {
|
||||
|
||||
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
|
||||
# we test for...
|
||||
if ! is_crosscompile ; then
|
||||
if ! is_crosscompile && ! tc-is-cross-compiler ; then
|
||||
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
|
||||
ebegin "Checking if the system can execute 32-bit binaries"
|
||||
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
|
||||
|
||||
@ -818,7 +818,7 @@ sanity_prechecks() {
|
||||
|
||||
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
|
||||
# we test for...
|
||||
if ! is_crosscompile ; then
|
||||
if ! is_crosscompile && ! tc-is-cross-compiler ; then
|
||||
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
|
||||
ebegin "Checking if the system can execute 32-bit binaries"
|
||||
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
|
||||
|
||||
@ -821,7 +821,7 @@ sanity_prechecks() {
|
||||
|
||||
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
|
||||
# we test for...
|
||||
if ! is_crosscompile ; then
|
||||
if ! is_crosscompile && ! tc-is-cross-compiler; then
|
||||
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
|
||||
ebegin "Checking if the system can execute 32-bit binaries"
|
||||
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
|
||||
|
||||
@ -821,7 +821,7 @@ sanity_prechecks() {
|
||||
|
||||
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
|
||||
# we test for...
|
||||
if ! is_crosscompile ; then
|
||||
if ! is_crosscompile && ! tc-is-cross-compiler ; then
|
||||
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
|
||||
ebegin "Checking if the system can execute 32-bit binaries"
|
||||
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
|
||||
|
||||
@ -817,7 +817,7 @@ sanity_prechecks() {
|
||||
|
||||
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
|
||||
# we test for...
|
||||
if ! is_crosscompile ; then
|
||||
if ! is_crosscompile && ! tc-is-cross-compiler ; then
|
||||
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
|
||||
ebegin "Checking if the system can execute 32-bit binaries"
|
||||
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
|
||||
|
||||
@ -817,7 +817,7 @@ sanity_prechecks() {
|
||||
|
||||
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
|
||||
# we test for...
|
||||
if ! is_crosscompile ; then
|
||||
if ! is_crosscompile && ! tc-is-cross-compiler ; then
|
||||
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
|
||||
ebegin "Checking if the system can execute 32-bit binaries"
|
||||
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
|
||||
|
||||
@ -817,7 +817,7 @@ sanity_prechecks() {
|
||||
|
||||
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
|
||||
# we test for...
|
||||
if ! is_crosscompile ; then
|
||||
if ! is_crosscompile && ! tc-is-cross-compiler ; then
|
||||
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
|
||||
ebegin "Checking if the system can execute 32-bit binaries"
|
||||
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user