Disable option checking in the toplevel, avoid 2.64 fopen glitch.

/:
	* configure.ac: Call AC_DISABLE_OPTION_CHECKING.
	(baseargs): Add --disable-option-checking.
	* configure: Regenerate.

config/:
	* override.m4 (AC_DISABLE_OPTION_CHECKING): Define to be
	empty if not defined, to avoid error with 2.59.
	(_AC_LANG_IO_PROGRAM): When the Autoconf version is exactly
	2.64, avoid per-language instances to drop fopen from test
	program.
This commit is contained in:
Ralf Wildenhues 2009-08-19 22:21:10 +00:00
parent c1102ce79a
commit 34a0f3cffa
5 changed files with 29 additions and 0 deletions

View File

@ -1,5 +1,9 @@
2009-08-19 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure.ac: Call AC_DISABLE_OPTION_CHECKING.
(baseargs): Add --disable-option-checking.
* configure: Regenerate.
* Makefile.def (configure-target-libiberty): Depend on
all-binutils and all-ld.
(configure-target-newlib): Likewise.

View File

@ -1,3 +1,11 @@
2009-08-19 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* override.m4 (AC_DISABLE_OPTION_CHECKING): Define to be
empty if not defined, to avoid error with 2.59.
(_AC_LANG_IO_PROGRAM): When the Autoconf version is exactly
2.64, avoid per-language instances to drop fopen from test
program.
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* extensions.m4 (AC_USE_SYSTEM_EXTENSIONS): Do not expand

View File

@ -58,6 +58,19 @@ m4_define([AC_INIT], m4_defn([AC_INIT])[
_GCC_AUTOCONF_VERSION_CHECK
])
dnl Turn AC_DISABLE_OPTION_CHECKING into a no-op if not defined.
m4_ifndef([AC_DISABLE_OPTION_CHECKING],
[m4_define([AC_DISABLE_OPTION_CHECKING])])
dnl Fix 2.64 cross compile detection for AVR and RTEMS
dnl by not trying to compile fopen.
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.64],
[m4_foreach([_GCC_LANG], [C, C++, Fortran, Fortran 77],
[m4_define([_AC_LANG_IO_PROGRAM(]_GCC_LANG[)], m4_defn([AC_LANG_PROGRAM(]_GCC_LANG[)]))])])
m4_version_prereq([2.60],, [
dnl We use $ac_pwd in some of the overrides below; ensure its definition
m4_divert_push([PARSE_ARGS])dnl

2
configure vendored
View File

@ -1509,6 +1509,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
progname=$0
@ -6546,6 +6547,7 @@ baseargs="$baseargs --program-transform-name='${gcc_transform_name}'"
if test "$silent" = yes; then
baseargs="$baseargs --silent"
fi
baseargs="$baseargs --disable-option-checking"
# For the build-side libraries, we just need to pretend we're native,
# and not use the same cache file. Multilibs are neither needed nor

View File

@ -25,6 +25,7 @@ m4_include(config/proginstall.m4)
AC_INIT(move-if-change)
AC_PREREQ(2.59)
AC_DISABLE_OPTION_CHECKING
progname=$0
# if PWD already has a value, it is probably wrong.
@ -2662,6 +2663,7 @@ baseargs="$baseargs --program-transform-name='${gcc_transform_name}'"
if test "$silent" = yes; then
baseargs="$baseargs --silent"
fi
baseargs="$baseargs --disable-option-checking"
# For the build-side libraries, we just need to pretend we're native,
# and not use the same cache file. Multilibs are neither needed nor