qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix configure logic for disabling multi-arch.

This commit is contained in:
Joseph Myers 2012-02-25 00:29:19 +00:00
parent 0f8bbd69cd
commit 6b1d1d46b9
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2012-02-24 Joseph Myers <joseph@codesourcery.com>
* manual/texinfo.tex: Update to version 2012-01-19.16. * manual/texinfo.tex: Update to version 2012-01-19.16.

2
configure vendored
View File

@ -4142,7 +4142,7 @@ _ACEOF
fi 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 if test x"$multi_arch" = xyes; then
as_fn_error $? "--enable-multi-arch support requires assembler and linker support" "$LINENO" 5 as_fn_error $? "--enable-multi-arch support requires assembler and linker support" "$LINENO" 5
else else

2
configure.in
View File

@ -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}) AC_DEFINE_UNQUOTED(ASM_TYPE_DIRECTIVE_PREFIX, ${libc_cv_asm_type_prefix})
fi 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 if test x"$multi_arch" = xyes; then
AC_MSG_ERROR([--enable-multi-arch support requires assembler and linker support]) AC_MSG_ERROR([--enable-multi-arch support requires assembler and linker support])
else else