From a2eafc7685e37c0077d9a4c4598b76bab9bec5d2 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 17 Jun 2005 14:49:38 +0000 Subject: [PATCH] aclocal.m4 (gcc_AC_CHECK_TOOL): Do not overwrite the passed variable. 2005-06-17 Paolo Bonzini * aclocal.m4 (gcc_AC_CHECK_TOOL): Do not overwrite the passed variable. From-SVN: r101127 --- gcc/ChangeLog | 6 ++++++ gcc/aclocal.m4 | 4 +++- gcc/configure | 12 +++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 29ec313a622..4451476e364 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-06-17 Paolo Bonzini + + * aclocal.m4 (gcc_AC_CHECK_TOOL): Do not overwrite the + passed variable. + * configure.ac: Regenerate. + 2005-06-17 Jan Hubicka * tree-optimize.c (execute_ipa_pass_list): New. diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index b180c1b9513..59e5845fa13 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -710,7 +710,9 @@ AC_REQUIRE([gcc_AC_BUILD_EXEEXT]) dnl shut up useless "checking for..." messages dnl we can still read them in config.log exec AS_MESSAGE_FD([])>/dev/null -AC_PATH_PROGS($1, $2, , $gcc_cv_tool_dirs) +if test "x[$]$1" = x; then + AC_PATH_PROGS($1, $2, , $gcc_cv_tool_dirs) +fi if test "x[$]$1" = x; then # If the loop above did not find a tool, then use whatever # one we can find in the users's path. We are looking for a diff --git a/gcc/configure b/gcc/configure index a5e04ec1c79..f557c2de921 100755 --- a/gcc/configure +++ b/gcc/configure @@ -12895,7 +12895,8 @@ fi exec 6>/dev/null -for ac_prog in as +if test "x$gcc_cv_as" = x; then + for ac_prog in as do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -12939,6 +12940,7 @@ fi test -n "$gcc_cv_as" && break done +fi if test "x$gcc_cv_as" = x; then # If the loop above did not find a tool, then use whatever # one we can find in the users's path. We are looking for a @@ -13065,7 +13067,8 @@ fi exec 6>/dev/null -for ac_prog in ld +if test "x$gcc_cv_ld" = x; then + for ac_prog in ld do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -13109,6 +13112,7 @@ fi test -n "$gcc_cv_ld" && break done +fi if test "x$gcc_cv_ld" = x; then # If the loop above did not find a tool, then use whatever # one we can find in the users's path. We are looking for a @@ -13201,7 +13205,8 @@ fi exec 6>/dev/null -for ac_prog in nm +if test "x$gcc_cv_nm" = x; then + for ac_prog in nm do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -13245,6 +13250,7 @@ fi test -n "$gcc_cv_nm" && break done +fi if test "x$gcc_cv_nm" = x; then # If the loop above did not find a tool, then use whatever # one we can find in the users's path. We are looking for a -- 2.30.2