diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-02-25 00:29:19 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-02-25 00:29:19 +0000 |
| commit | 6b1d1d46b9344dab2fb36734c61dc9d517214a6d (patch) | |
| tree | 2aeb9167d48d511fe44f324b0a89342c6246f7cc | |
| parent | 0f8bbd69cd95c8350571763d15554b9bc3c62226 (diff) | |
| download | glibc-6b1d1d46b9344dab2fb36734c61dc9d517214a6d.tar.gz glibc-6b1d1d46b9344dab2fb36734c61dc9d517214a6d.tar.xz glibc-6b1d1d46b9344dab2fb36734c61dc9d517214a6d.zip | |
Fix configure logic for disabling multi-arch.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 035c25ecbf..27a63376ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 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. 2012-02-24 Joseph Myers <joseph@codesourcery.com> diff --git a/configure b/configure index ea02e72872..c07f60e513 100755 --- a/configure +++ b/configure @@ -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 diff --git a/configure.in b/configure.in index af42c8ad2f..335c796c2b 100644 --- a/configure.in +++ b/configure.in @@ -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 |