mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-17 05:08:57 +08:00
configure.in: Replace NCN_STRICT_CHECK_TOOL with NCN_STRICT_CHECK_TOOLS...
toplevel: 2005-08-12 Paolo Bonzini <bonzini@gnu.org> * configure.in: Replace NCN_STRICT_CHECK_TOOL with NCN_STRICT_CHECK_TOOLS, and likewise for NCN_STRICT_CHECK_TARGET_TOOLS. Look for alternate names of the target cc and c++ * configure: Regenerate. config: 2005-08-12 Paolo Bonzini <bonzini@gnu.org> * config/acx.m4 (NCN_CHECK_TARGET_TOOL, NCN_STRICT_CHECK_TOOL, NCN_STRICT_CHECK_TARGET_TOOL): Remove. (NCN_STRICT_CHECK_TOOLS, NCN_STRICT_CHECK_TARGET_TOOLS): New, based on the deleted macros. From-SVN: r103036
This commit is contained in:
Paolo Bonzini
Paolo Bonzini
parent
7b8acc3494
commit
2693c0b0b3
@ -1,3 +1,10 @@
|
||||
2005-08-12 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* configure.in: Replace NCN_STRICT_CHECK_TOOL with
|
||||
NCN_STRICT_CHECK_TOOLS, and likewise for NCN_STRICT_CHECK_TARGET_TOOLS.
|
||||
Look for alternate names of the target cc and c++
|
||||
* configure: Regenerate.
|
||||
|
||||
2005-08-08 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* configure.in (CC_FOR_TARGET, CXX_FOR_TARGET, GCJ_FOR_TARGET,
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
2005-08-12 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* config/acx.m4 (NCN_CHECK_TARGET_TOOL, NCN_STRICT_CHECK_TOOL,
|
||||
NCN_STRICT_CHECK_TARGET_TOOL): Remove.
|
||||
(NCN_STRICT_CHECK_TOOLS, NCN_STRICT_CHECK_TARGET_TOOLS): New,
|
||||
based on the deleted macros.
|
||||
|
||||
2005-07-27 Mark Mitchell <mark@codesourcery.com>
|
||||
|
||||
* mt-gnu (CXXFLAGS): Include SYSROOT_CFLAGS_FOR_TARGET.
|
||||
|
||||
@ -103,72 +103,58 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
|
||||
]) []dnl # _NCN_TOOL_PREFIXES
|
||||
|
||||
####
|
||||
# NCN_CHECK_TARGET_TOOL(variable, prog-to-check-for,[value-if-not-found],[path])
|
||||
# Like AC_CHECK_TOOL, but tries a prefix of the target, not the host.
|
||||
# Code is pretty much lifted from autoconf2.53.
|
||||
# NCN_STRICT_CHECK_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path])
|
||||
# Like plain AC_CHECK_TOOLS, but require prefix if build!=target.
|
||||
|
||||
AC_DEFUN([NCN_CHECK_TARGET_TOOL],
|
||||
AC_DEFUN([NCN_STRICT_CHECK_TOOLS],
|
||||
[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
|
||||
if test -n "$ncn_target_tool_prefix"; then
|
||||
AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}$2],
|
||||
[${ncn_target_tool_prefix}$2], , [$4])
|
||||
fi
|
||||
if test -z "$ac_cv_prog_$1" ; then
|
||||
ncn_cv_$1=$$1
|
||||
AC_CHECK_PROG([ncn_cv_$1], [$2], [$2], [$3], [$4])
|
||||
$1=$ncn_cv_$1
|
||||
else
|
||||
$1="$ac_cv_prog_$1"
|
||||
fi
|
||||
]) []dnl # NCN_CHECK_TARGET_TOOL
|
||||
|
||||
|
||||
####
|
||||
# NCN_STRICT_CHECK_TOOL(variable, prog-to-check-for,[value-if-not-found],[path])
|
||||
# Like AC_CHECK_TOOL, but requires the prefix if build!=host.
|
||||
|
||||
AC_DEFUN([NCN_STRICT_CHECK_TOOL],
|
||||
[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
|
||||
if test -n "$ncn_tool_prefix"; then
|
||||
AC_CHECK_PROG([$1], [${ncn_tool_prefix}$2],
|
||||
[${ncn_tool_prefix}$2], , [$4])
|
||||
fi
|
||||
for ncn_progname in $2; do
|
||||
if test -n "$ncn_tool_prefix"; then
|
||||
AC_CHECK_PROG([$1], [${ncn_tool_prefix}${ncn_progname}],
|
||||
[${ncn_tool_prefix}${ncn_progname}], , [$4])
|
||||
fi
|
||||
if test -z "$ac_cv_prog_$1" && test $build = $host ; then
|
||||
AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4])
|
||||
fi
|
||||
test -n "$ac_cv_prog_$1" && break
|
||||
done
|
||||
|
||||
if test -z "$ac_cv_prog_$1" ; then
|
||||
ifelse([$3],[], [set dummy $2
|
||||
if test $build = $host ; then
|
||||
ncn_cv_$1=$$1
|
||||
AC_CHECK_PROG([ncn_cv_$1], [$2], [$2], [ifelse([$3],[],[$2],[$3])], [$4])
|
||||
$1=$ncn_cv_$1
|
||||
$1="[$]2"
|
||||
else
|
||||
$1="ifelse([$3],[],[${ncn_tool_prefix}$2],[$3])"
|
||||
fi
|
||||
else
|
||||
$1="$ac_cv_prog_$1"
|
||||
$1="${ncn_tool_prefix}[$]2"
|
||||
fi], [$1="$3"])
|
||||
fi
|
||||
]) []dnl # NCN_STRICT_CHECK_TOOL
|
||||
|
||||
]) []dnl # NCN_STRICT_CHECK_TOOLS
|
||||
|
||||
####
|
||||
# NCN_STRICT_CHECK_TARGET_TOOL(variable, prog-to-check-for,[value-if-not-found],[path])
|
||||
# Like NCN_CHECK_TARGET_TOOL, but requires the prefix if build!=target.
|
||||
# NCN_STRICT_CHECK_TARGET_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path])
|
||||
# Like CVS Autoconf AC_CHECK_TARGET_TOOLS, but require prefix if build!=target.
|
||||
|
||||
AC_DEFUN([NCN_STRICT_CHECK_TARGET_TOOL],
|
||||
AC_DEFUN([NCN_STRICT_CHECK_TARGET_TOOLS],
|
||||
[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
|
||||
if test -n "$ncn_target_tool_prefix"; then
|
||||
AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}$2],
|
||||
[${ncn_target_tool_prefix}$2], , [$4])
|
||||
fi
|
||||
if test -z "$ac_cv_prog_$1" ; then
|
||||
if test $build = $target ; then
|
||||
ncn_cv_$1=$$1
|
||||
AC_CHECK_PROG([ncn_cv_$1], [$2], [$2], [ifelse([$3],[],[$2],[$3])], [$4])
|
||||
$1=$ncn_cv_$1
|
||||
else
|
||||
$1="ifelse([$3],[],[${ncn_target_tool_prefix}$2],[$3])"
|
||||
for ncn_progname in $2; do
|
||||
if test -n "$ncn_target_tool_prefix"; then
|
||||
AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}${ncn_progname}],
|
||||
[${ncn_target_tool_prefix}${ncn_progname}], , [$4])
|
||||
fi
|
||||
else
|
||||
$1="$ac_cv_prog_$1"
|
||||
if test -z "$ac_cv_prog_$1" && test $build = $target ; then
|
||||
AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4])
|
||||
fi
|
||||
test -n "$ac_cv_prog_$1" && break
|
||||
done
|
||||
|
||||
if test -z "$ac_cv_prog_$1" ; then
|
||||
ifelse([$3],[], [set dummy $2
|
||||
if test $build = $target ; then
|
||||
$1="[$]2"
|
||||
else
|
||||
$1="${ncn_target_tool_prefix}[$]2"
|
||||
fi], [$1="$3"])
|
||||
fi
|
||||
]) []dnl # NCN_STRICT_CHECK_TARGET_TOOL
|
||||
]) []dnl # NCN_STRICT_CHECK_TARGET_TOOLS
|
||||
|
||||
###
|
||||
# AC_PROG_CPP_WERROR
|
||||
|
||||
42
configure.in
42
configure.in
@ -2081,15 +2081,15 @@ AC_SUBST(CC_FOR_BUILD)
|
||||
AC_SUBST(config_shell)
|
||||
|
||||
# Host tools.
|
||||
NCN_STRICT_CHECK_TOOL(AR, ar)
|
||||
NCN_STRICT_CHECK_TOOL(AS, as)
|
||||
NCN_STRICT_CHECK_TOOL(DLLTOOL, dlltool)
|
||||
NCN_STRICT_CHECK_TOOL(LD, ld)
|
||||
NCN_STRICT_CHECK_TOOL(NM, nm)
|
||||
NCN_STRICT_CHECK_TOOL(RANLIB, ranlib, :)
|
||||
NCN_STRICT_CHECK_TOOL(WINDRES, windres)
|
||||
NCN_STRICT_CHECK_TOOL(OBJCOPY, objcopy)
|
||||
NCN_STRICT_CHECK_TOOL(OBJDUMP, objdump)
|
||||
NCN_STRICT_CHECK_TOOLS(AR, ar)
|
||||
NCN_STRICT_CHECK_TOOLS(AS, as)
|
||||
NCN_STRICT_CHECK_TOOLS(DLLTOOL, dlltool)
|
||||
NCN_STRICT_CHECK_TOOLS(LD, ld)
|
||||
NCN_STRICT_CHECK_TOOLS(NM, nm)
|
||||
NCN_STRICT_CHECK_TOOLS(RANLIB, ranlib, :)
|
||||
NCN_STRICT_CHECK_TOOLS(WINDRES, windres)
|
||||
NCN_STRICT_CHECK_TOOLS(OBJCOPY, objcopy)
|
||||
NCN_STRICT_CHECK_TOOLS(OBJDUMP, objdump)
|
||||
AC_SUBST(CC)
|
||||
AC_SUBST(CXX)
|
||||
AC_SUBST(CFLAGS)
|
||||
@ -2098,18 +2098,18 @@ AC_SUBST(CXXFLAGS)
|
||||
|
||||
# Target tools. Do the tests using the names they may have passed in
|
||||
# the environment, then move it to CONFIGURED_*_FOR_TARGET.
|
||||
NCN_STRICT_CHECK_TARGET_TOOL(AR_FOR_TARGET, ar)
|
||||
NCN_STRICT_CHECK_TARGET_TOOL(AS_FOR_TARGET, as)
|
||||
NCN_STRICT_CHECK_TARGET_TOOL(CC_FOR_TARGET, cc)
|
||||
NCN_STRICT_CHECK_TARGET_TOOL(CXX_FOR_TARGET, c++)
|
||||
NCN_STRICT_CHECK_TARGET_TOOL(DLLTOOL_FOR_TARGET, dlltool)
|
||||
NCN_STRICT_CHECK_TARGET_TOOL(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET})
|
||||
NCN_STRICT_CHECK_TARGET_TOOL(GCJ_FOR_TARGET, gcj)
|
||||
NCN_STRICT_CHECK_TARGET_TOOL(GFORTRAN_FOR_TARGET, gfortran)
|
||||
NCN_STRICT_CHECK_TARGET_TOOL(LD_FOR_TARGET, ld)
|
||||
NCN_STRICT_CHECK_TARGET_TOOL(NM_FOR_TARGET, nm)
|
||||
NCN_STRICT_CHECK_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib, :)
|
||||
NCN_STRICT_CHECK_TARGET_TOOL(WINDRES_FOR_TARGET, windres)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(AR_FOR_TARGET, ar)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(AS_FOR_TARGET, as)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(CC_FOR_TARGET, cc gcc)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TARGET, c++ g++ cxx gxx)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(DLLTOOL_FOR_TARGET, dlltool)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET})
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(GCJ_FOR_TARGET, gcj)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(LD_FOR_TARGET, ld)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(NM_FOR_TARGET, nm)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(RANLIB_FOR_TARGET, ranlib, :)
|
||||
NCN_STRICT_CHECK_TARGET_TOOLS(WINDRES_FOR_TARGET, windres)
|
||||
|
||||
CONFIGURED_AR_FOR_TARGET="$AR_FOR_TARGET"
|
||||
CONFIGURED_AS_FOR_TARGET="$AS_FOR_TARGET"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user