diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2009-08-19 22:21:10 +0000 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2009-08-19 22:21:10 +0000 |
| commit | 5546e07b4f4106b0f11d3d1ab206422a636fd42b (patch) | |
| tree | 4f59e048c538113c131087c7a636999dcea095d8 | |
| parent | b46f14f71120fcc473668e1029831769ef2fa358 (diff) | |
| download | cygnal-5546e07b4f4106b0f11d3d1ab206422a636fd42b.tar.gz cygnal-5546e07b4f4106b0f11d3d1ab206422a636fd42b.tar.bz2 cygnal-5546e07b4f4106b0f11d3d1ab206422a636fd42b.zip | |
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.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | config/ChangeLog | 8 | ||||
| -rw-r--r-- | config/override.m4 | 13 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
5 files changed, 29 insertions, 0 deletions
@@ -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. diff --git a/config/ChangeLog b/config/ChangeLog index c9a51dc98..7a2a7b642 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -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 diff --git a/config/override.m4 b/config/override.m4 index bf112db99..a10146ff7 100644 --- a/config/override.m4 +++ b/config/override.m4 @@ -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 @@ -1511,6 +1511,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + progname=$0 # if PWD already has a value, it is probably wrong. if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi @@ -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 diff --git a/configure.ac b/configure.ac index 7508758f0..9da004896 100644 --- a/configure.ac +++ b/configure.ac @@ -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 |