Alexandre Oliva - fix toplev handling of config.cache (original) (raw)

This is the mail archive of the gcc-patches@gcc.gnu.orgmailing list for the GCC project.

• From: Alexandre Oliva
• To: gcc-patches at gcc dot gnu dot org
• Date: Sun, 18 Feb 2007 20:50:44 -0200
• Subject: fix toplev handling of config.cache

The NCN_STRICT_CHECK*_TOOLS macros didn't cope well with cached results: in their presence, the variable that was supposed to be set would remain unset.

This patch fixes it, makes the cache use non-silent, and adds these variables to the list of variables documented in configure --help and checked for cache inconsistency.

Tested on x86_64-linux-gnu. I'm checking it in.

for config/ChangeLog from Alexandre Oliva aoliva@redhat.com

* acx.m4 (NCN_STRICT_CHECK_TOOLS): Mark environment variable as
precious.  Prefer it over a cached value.  Use cached value
verbosely.
(NCN_STRICT_CHECK_TARGET_TOOLS): Likewise.  Don't override
environment variable with build-time tools.

for ChangeLog from Alexandre Oliva aoliva@redhat.com

* configure: Rebuilt.

Index: config/acx.m4

--- config/acx.m4.orig 2007-02-18 20:29:40.000000000 -0200 +++ config/acx.m4 2007-02-18 20:41:37.000000000 -0200 @@ -123,6 +123,20 @@ test -n "$target_alias" && ncn_target_to

AC_DEFUN([NCN_STRICT_CHECK_TOOLS], [AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl +AC_ARG_VAR([$1], [$1 for the host]) + +if test -n "[$]$1"; then

• ac_cv_prog_$1=[$]$1 +elif test -n "$ac_cv_prog_$1"; then
• 1=1=1=ac_cv_prog_$1 +fi
• +if test -n "$ac_cv_prog_$1"; then
• for ncn_progname in $2; do
• AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4])
• done +fi
• for ncn_progname in $2; do if test -n "$ncn_tool_prefix"; then AC_CHECK_PROG([$1], [${ncn_tool_prefix}${ncn_progname}],

@@ -150,7 +164,21 @@ fi

AC_DEFUN([NCN_STRICT_CHECK_TARGET_TOOLS], [AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl -if test -n "$with_build_time_tools"; then +AC_ARG_VAR([$1], patsubst([$1], [_FOR_TARGET$], [])[ for the target]) + +if test -n "[$]$1"; then

• ac_cv_prog_$1=[$]$1 +elif test -n "$ac_cv_prog_$1"; then
• 1=1=1=ac_cv_prog_$1 +fi
• +if test -n "$ac_cv_prog_$1"; then
• for ncn_progname in $2; do
• AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4])
• done +fi
• +if test -z "$ac_cv_prog_$1" && test -n "$with_build_time_tools"; then for ncn_progname in $2; do AC_MSG_CHECKING([for ncnprognamein{ncn_progname} in ncnp​rognameinwith_build_time_tools]) if test -x withbuildtimetools/with_build_time_tools/withb​uildt​imet​ools/{ncn_progname}; then

-- Alexandre Oliva http://www.lsd.ic.unicamp.br/~oliva/ FSF Latin America Board Member http://www.fsfla.org/ Red Hat Compiler Engineer aoliva@{redhat.com, gcc.gnu.org} Free Software Evangelist oliva@{lsd.ic.unicamp.br, gnu.org}