From e8b053801c57d8d7daf305d6b7ce01cbd4958e73 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 26 Jan 2006 18:52:49 +0000 Subject: configure.in: Set with_gnu_as, with_gnu_ld, with_newlib earlier. 2006-01-26 Paolo Bonzini * configure.in: Set with_gnu_as, with_gnu_ld, with_newlib earlier. Set md_exec_prefix. Use ACX_CHECK_INSTALLED_TARGET_TOOL to find the assembler, linker and binutils. * configure: Regenerate. 2006-01-26 Paolo Bonzini * config/acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Test $with_build_time_tools. (ACX_PATH_SEP): New. (ACX_TOOL_DIRS): Move here from the gcc directory. (ACX_CHECK_INSTALLED_TARGET_TOOL): New. (GCC_TARGET_TOOL): Do not use a host tool if we found a target tool with a complete path in either $with_build_time_tools or $exec_prefix. 2006-01-26 Paolo Bonzini * configure.ac: Expect target tools paths to be passed from the toplevel and wrap the detection into AS_SET_VAR_IF. Extract side-effects out of AS_SET_VAR_IF. * acinclude.m4 (gcc_AC_TOOL_DIRS, gcc_AC_CHECK_TOOL): Remove. From-SVN: r110266 --- gcc/acinclude.m4 | 87 -------------------------------------------------------- 1 file changed, 87 deletions(-) (limited to 'gcc/acinclude.m4') diff --git a/gcc/acinclude.m4 b/gcc/acinclude.m4 index 3893b45..ec1931c 100644 --- a/gcc/acinclude.m4 +++ b/gcc/acinclude.m4 @@ -506,94 +506,7 @@ m4_ifdef([GCC_TARGET_TEMPLATE($1)],[],[#ifndef USED_FOR_TARGET #endif ]))]) -AC_DEFUN([gcc_AC_TOOL_DIRS], [ -# When searching for the assembler or linker, search the same directories -# that the installed compiler will search. Else we may find the wrong -# assembler or linker and lose. If we do not find a suitable binary, -# then try the user's path. -# -# Also note we have to check MD_EXEC_PREFIX before checking the user's path. -if test "x$exec_prefix" = xNONE; then - if test "x$prefix" = xNONE; then - gcc_cv_tool_prefix=/usr/local - else - gcc_cv_tool_prefix=$prefix - fi -else - gcc_cv_tool_prefix=$exec_prefix -fi - -if test x$host = x$build; then - gcc_cv_tool_dirs="$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical/$gcc_version" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$PATH_SEPARATOR$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$PATH_SEPARATOR/usr/lib/gcc/$target_noncanonical/$gcc_version" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$PATH_SEPARATOR/usr/lib/gcc/$target_noncanonical" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$PATH_SEPARATOR$gcc_cv_tool_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version" - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$PATH_SEPARATOR$gcc_cv_tool_prefix/$target_noncanonical/bin" -else - gcc_cv_tool_dirs= -fi - -if test x$build = x$target; then - # Rummage through tm_files looking for MD_EXEC_PREFIX - md_dirs= - for f in ${tm_file_list}; do - if test -f $f; then - if grep '^#[ ]*undef[ ]*MD_EXEC_PREFIX' $f > /dev/null; then - md_dirs= - fi - md_dirs="$md_dirs "`sed -n -e 's@^#[ ]*define[ ]*MD_EXEC_PREFIX[ ]*"\(.*\)/"@\1@p' < $f` - fi - done - for f in ${md_dirs}; do - gcc_cv_tool_dirs="$gcc_cv_tool_dirs$PATH_SEPARATOR$f" - done -fi]) - dnl Make sure that build_exeext is looked for AC_DEFUN([gcc_AC_BUILD_EXEEXT], [ ac_executable_extensions="$build_exeext"]) -AC_DEFUN([gcc_AC_CHECK_TOOL], [ -AC_REQUIRE([gcc_AC_TOOL_DIRS]) -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 - -# First try the environment variables. Handle full paths or basenames. -if test "x[$]$1" = x && test -n "[$]$4"; then - AC_PATH_PROG($1, [$]$4) -fi -if test "x[$]$1" = x && test -n "[$]$5" && test x$host = x$target; then - AC_PATH_PROG($1, [$]$5) -fi - -if test "x[$]$1" = x; then - # The AC_PATH_PROGS macro doesn't work properly when its 4th argument - # is empty. - if test "x$gcc_cv_tool_dirs" = x; then - $1= - else - AC_PATH_PROGS($1, $2, , $gcc_cv_tool_dirs) - fi -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 - # ${build} -> ${target} tool. - if test "x$program_prefix" != xNONE; then - default_tool_name=${program_prefix}$2 - elif test x$build != x$host && test x$build != x$target; then - default_tool_name=${target_noncanonical}-$2 - else - default_tool_name=`echo $2 | sed "${program_transform_name}"` - fi - AC_PATH_PROGS($1, $default_tool_name, - $gcc_cv_tool_prefix/bin/$default_tool_name$build_exeext) -fi -test "$silent" != yes && exec AS_MESSAGE_FD([])>&1 - -$3="[$]$1" -AC_SUBST($3)]) -- cgit v1.1