diff options
| author | Roland McGrath <roland@redhat.com> | 2010-07-26 12:45:17 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@redhat.com> | 2010-07-26 12:45:17 -0700 |
| commit | 1c7570ff36595cba9f5797453eda95969a72c56e (patch) | |
| tree | 60b08315b0f89203fe071e610b24606dae75305d | |
| parent | 8d50becc0421e86fc15f9a3453cf1772fc11f565 (diff) | |
| download | glibc-1c7570ff36595cba9f5797453eda95969a72c56e.tar.gz glibc-1c7570ff36595cba9f5797453eda95969a72c56e.tar.xz glibc-1c7570ff36595cba9f5797453eda95969a72c56e.zip | |
BZ #11840: Fix config.cache usage for -fgnu89-inline check.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | config.make.in | 2 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.in | 6 |
4 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 36b36fc428..6603a56028 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-07-26 Roland McGrath <roland@redhat.com> + + [BZ #11840] + * configure.in (-fgnu89-inline check): Set and substitute + gnu89_inline, not libc_cv_gnu89_inline. + * configure: Regenerated. + * config.make.in (gnu89-inline-CFLAGS): Use @gnu89_inline@. + 2010-07-26 Ulrich Drepper <drepper@redhat.com> * string/test-strnlen.c: New file. diff --git a/config.make.in b/config.make.in index adfda9d9a4..efffee4bb7 100644 --- a/config.make.in +++ b/config.make.in @@ -59,7 +59,7 @@ have-cpp-asm-debuginfo = @libc_cv_cpp_asm_debuginfo@ enable-check-abi = @enable_check_abi@ have-forced-unwind = @libc_cv_forced_unwind@ have-fpie = @libc_cv_fpie@ -gnu89-inline-CFLAGS = @libc_cv_gnu89_inline@ +gnu89-inline-CFLAGS = @gnu89_inline@ have-ssp = @libc_cv_ssp@ have-selinux = @have_selinux@ have-libaudit = @have_libaudit@ diff --git a/configure b/configure index dd33760150..ac8638691a 100755 --- a/configure +++ b/configure @@ -638,7 +638,7 @@ libc_cv_cc_submachine exceptions no_whole_archive libc_cv_have_initfini -libc_cv_gnu89_inline +gnu89_inline libc_cv_ssp fno_unit_at_a_time libc_cv_hashstyle @@ -6704,9 +6704,9 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_gnu89_inline" >&5 $as_echo "$libc_cv_gnu89_inline" >&6; } if test $libc_cv_gnu89_inline = yes; then - libc_cv_gnu89_inline=-fgnu89-inline + gnu89_inline=-fgnu89-inline else - libc_cv_gnu89_inline= + gnu89_inline= fi diff --git a/configure.in b/configure.in index 56849dfc48..036a950d8f 100644 --- a/configure.in +++ b/configure.in @@ -1803,11 +1803,11 @@ else fi rm -f conftest*]) if test $libc_cv_gnu89_inline = yes; then - libc_cv_gnu89_inline=-fgnu89-inline + gnu89_inline=-fgnu89-inline else - libc_cv_gnu89_inline= + gnu89_inline= fi -AC_SUBST(libc_cv_gnu89_inline) +AC_SUBST(gnu89_inline) if test $elf != yes; then AC_CACHE_CHECK(for .init and .fini sections, libc_cv_have_initfini, |