mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 23:00:07 +00:00
Fix configure logic for disabling multi-arch.
This commit is contained in:
parent
0f8bbd69cd
commit
6b1d1d46b9
@ -1,3 +1,8 @@
|
||||
2012-02-24 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
* configure.in: Use -o not -a in test for unsupported multi-arch.
|
||||
* configure: Regenerated.
|
||||
|
||||
2012-02-24 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
* manual/texinfo.tex: Update to version 2012-01-19.16.
|
||||
|
2
configure
vendored
2
configure
vendored
@ -4142,7 +4142,7 @@ _ACEOF
|
||||
|
||||
fi
|
||||
|
||||
if test x"$libc_cv_asm_gnu_indirect_function" != xyes -a x"$libc_cv_asm_type_prefix" = xno; then
|
||||
if test x"$libc_cv_asm_gnu_indirect_function" != xyes -o x"$libc_cv_asm_type_prefix" = xno; then
|
||||
if test x"$multi_arch" = xyes; then
|
||||
as_fn_error $? "--enable-multi-arch support requires assembler and linker support" "$LINENO" 5
|
||||
else
|
||||
|
@ -598,7 +598,7 @@ if test "x$libc_cv_asm_type_prefix" != xno; then
|
||||
AC_DEFINE_UNQUOTED(ASM_TYPE_DIRECTIVE_PREFIX, ${libc_cv_asm_type_prefix})
|
||||
fi
|
||||
|
||||
if test x"$libc_cv_asm_gnu_indirect_function" != xyes -a x"$libc_cv_asm_type_prefix" = xno; then
|
||||
if test x"$libc_cv_asm_gnu_indirect_function" != xyes -o x"$libc_cv_asm_type_prefix" = xno; then
|
||||
if test x"$multi_arch" = xyes; then
|
||||
AC_MSG_ERROR([--enable-multi-arch support requires assembler and linker support])
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user