Skip to content

R
riscv-gcc-1
Commit 3b42a882 by Mike Stump Committed by Mike Stump
Options

acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Fix incremental builds. 

	* acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Fix incremental builds.
	(ACX_HAVE_GCC_FOR_TARGET): Likewise.

From-SVN: r126013
parent 2caf766b
Showing with 48 additions and 11 deletions
config/ChangeLog
2007-06-20 Mike Stump <mrs@apple.com>
* acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Fix incremental builds.
(ACX_HAVE_GCC_FOR_TARGET): Likewise.
2007-06-14 Paolo Bonzini <bonzini@gnu.org> 2007-06-14 Paolo Bonzini <bonzini@gnu.org>
* acx.m4 (ACX_CHECK_PROG_VER): Remove duplicate lines. * acx.m4 (ACX_CHECK_PROG_VER): Remove duplicate lines.
......
config/acx.m4
...@@ -211,6 +211,8 @@ if test -z "$ac_cv_prog_$1" ; then ...@@ -211,6 +211,8 @@ if test -z "$ac_cv_prog_$1" ; then
else else
$1="${ncn_target_tool_prefix}[$]2" $1="${ncn_target_tool_prefix}[$]2"
fi], [$1="$3"]) fi], [$1="$3"])
else
$1="$ac_cv_prog_$1"
fi fi
]) []dnl # NCN_STRICT_CHECK_TARGET_TOOLS ]) []dnl # NCN_STRICT_CHECK_TARGET_TOOLS
...@@ -325,7 +327,7 @@ if test -z "$ac_cv_path_$1" ; then ...@@ -325,7 +327,7 @@ if test -z "$ac_cv_path_$1" ; then
elif test $build != $host && test $have_gcc_for_target = yes; then elif test $build != $host && test $have_gcc_for_target = yes; then
$1=`$GCC_FOR_TARGET --print-prog-name=$2` $1=`$GCC_FOR_TARGET --print-prog-name=$2`
test [$]$1=$2 && $1= test [$]$1=$2 && $1=
ac_cv_path_$1=[$]$1 test -n "[$]$1" && ac_cv_path_$1=[$]$1
fi fi
fi fi
if test -z "$ac_cv_path_$1" && test -n "$gcc_cv_tool_dirs"; then if test -z "$ac_cv_path_$1" && test -n "$gcc_cv_tool_dirs"; then
......
configure
...@@ -7875,6 +7875,8 @@ if test -z "$ac_cv_prog_CC_FOR_TARGET" ; then ...@@ -7875,6 +7875,8 @@ if test -z "$ac_cv_prog_CC_FOR_TARGET" ; then
else else
CC_FOR_TARGET="${ncn_target_tool_prefix}$2" CC_FOR_TARGET="${ncn_target_tool_prefix}$2"
fi fi
else
CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET"
fi fi
...@@ -8028,6 +8030,8 @@ if test -z "$ac_cv_prog_CXX_FOR_TARGET" ; then ...@@ -8028,6 +8030,8 @@ if test -z "$ac_cv_prog_CXX_FOR_TARGET" ; then
else else
CXX_FOR_TARGET="${ncn_target_tool_prefix}$2" CXX_FOR_TARGET="${ncn_target_tool_prefix}$2"
fi fi
else
CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET"
fi fi
...@@ -8176,6 +8180,8 @@ fi ...@@ -8176,6 +8180,8 @@ fi
if test -z "$ac_cv_prog_GCC_FOR_TARGET" ; then if test -z "$ac_cv_prog_GCC_FOR_TARGET" ; then
GCC_FOR_TARGET="${CC_FOR_TARGET}" GCC_FOR_TARGET="${CC_FOR_TARGET}"
else
GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET"
fi fi
...@@ -8329,6 +8335,8 @@ if test -z "$ac_cv_prog_GCJ_FOR_TARGET" ; then ...@@ -8329,6 +8335,8 @@ if test -z "$ac_cv_prog_GCJ_FOR_TARGET" ; then
else else
GCJ_FOR_TARGET="${ncn_target_tool_prefix}$2" GCJ_FOR_TARGET="${ncn_target_tool_prefix}$2"
fi fi
else
GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET"
fi fi
...@@ -8482,6 +8490,8 @@ if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" ; then ...@@ -8482,6 +8490,8 @@ if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" ; then
else else
GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}$2" GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}$2"
fi fi
else
GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET"
fi fi
...@@ -8518,7 +8528,7 @@ echo "${ECHO_T}no" >&6 ...@@ -8518,7 +8528,7 @@ echo "${ECHO_T}no" >&6
elif test $build != $host && test $have_gcc_for_target = yes; then elif test $build != $host && test $have_gcc_for_target = yes; then
AR_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ar` AR_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ar`
test $AR_FOR_TARGET=ar && AR_FOR_TARGET= test $AR_FOR_TARGET=ar && AR_FOR_TARGET=
ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET test -n "$AR_FOR_TARGET" && ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET
fi fi
fi fi
if test -z "$ac_cv_path_AR_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then if test -z "$ac_cv_path_AR_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
...@@ -8714,6 +8724,8 @@ if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then ...@@ -8714,6 +8724,8 @@ if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then
else else
AR_FOR_TARGET="${ncn_target_tool_prefix}$2" AR_FOR_TARGET="${ncn_target_tool_prefix}$2"
fi fi
else
AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET"
fi fi
else else
...@@ -8739,7 +8751,7 @@ echo "${ECHO_T}no" >&6 ...@@ -8739,7 +8751,7 @@ echo "${ECHO_T}no" >&6
elif test $build != $host && test $have_gcc_for_target = yes; then elif test $build != $host && test $have_gcc_for_target = yes; then
AS_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=as` AS_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=as`
test $AS_FOR_TARGET=as && AS_FOR_TARGET= test $AS_FOR_TARGET=as && AS_FOR_TARGET=
ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET test -n "$AS_FOR_TARGET" && ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET
fi fi
fi fi
if test -z "$ac_cv_path_AS_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then if test -z "$ac_cv_path_AS_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
...@@ -8935,6 +8947,8 @@ if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then ...@@ -8935,6 +8947,8 @@ if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then
else else
AS_FOR_TARGET="${ncn_target_tool_prefix}$2" AS_FOR_TARGET="${ncn_target_tool_prefix}$2"
fi fi
else
AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET"
fi fi
else else
...@@ -8960,7 +8974,7 @@ echo "${ECHO_T}no" >&6 ...@@ -8960,7 +8974,7 @@ echo "${ECHO_T}no" >&6
elif test $build != $host && test $have_gcc_for_target = yes; then elif test $build != $host && test $have_gcc_for_target = yes; then
DLLTOOL_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=dlltool` DLLTOOL_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=dlltool`
test $DLLTOOL_FOR_TARGET=dlltool && DLLTOOL_FOR_TARGET= test $DLLTOOL_FOR_TARGET=dlltool && DLLTOOL_FOR_TARGET=
ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET test -n "$DLLTOOL_FOR_TARGET" && ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET
fi fi
fi fi
if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
...@@ -9156,6 +9170,8 @@ if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then ...@@ -9156,6 +9170,8 @@ if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then
else else
DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}$2" DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}$2"
fi fi
else
DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET"
fi fi
else else
...@@ -9181,7 +9197,7 @@ echo "${ECHO_T}no" >&6 ...@@ -9181,7 +9197,7 @@ echo "${ECHO_T}no" >&6
elif test $build != $host && test $have_gcc_for_target = yes; then elif test $build != $host && test $have_gcc_for_target = yes; then
LD_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ld` LD_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ld`
test $LD_FOR_TARGET=ld && LD_FOR_TARGET= test $LD_FOR_TARGET=ld && LD_FOR_TARGET=
ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET test -n "$LD_FOR_TARGET" && ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET
fi fi
fi fi
if test -z "$ac_cv_path_LD_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then if test -z "$ac_cv_path_LD_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
...@@ -9377,6 +9393,8 @@ if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then ...@@ -9377,6 +9393,8 @@ if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then
else else
LD_FOR_TARGET="${ncn_target_tool_prefix}$2" LD_FOR_TARGET="${ncn_target_tool_prefix}$2"
fi fi
else
LD_FOR_TARGET="$ac_cv_prog_LD_FOR_TARGET"
fi fi
else else
...@@ -9402,7 +9420,7 @@ echo "${ECHO_T}no" >&6 ...@@ -9402,7 +9420,7 @@ echo "${ECHO_T}no" >&6
elif test $build != $host && test $have_gcc_for_target = yes; then elif test $build != $host && test $have_gcc_for_target = yes; then
LIPO_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=lipo` LIPO_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=lipo`
test $LIPO_FOR_TARGET=lipo && LIPO_FOR_TARGET= test $LIPO_FOR_TARGET=lipo && LIPO_FOR_TARGET=
ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET test -n "$LIPO_FOR_TARGET" && ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET
fi fi
fi fi
if test -z "$ac_cv_path_LIPO_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then if test -z "$ac_cv_path_LIPO_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
...@@ -9598,6 +9616,8 @@ if test -z "$ac_cv_prog_LIPO_FOR_TARGET" ; then ...@@ -9598,6 +9616,8 @@ if test -z "$ac_cv_prog_LIPO_FOR_TARGET" ; then
else else
LIPO_FOR_TARGET="${ncn_target_tool_prefix}$2" LIPO_FOR_TARGET="${ncn_target_tool_prefix}$2"
fi fi
else
LIPO_FOR_TARGET="$ac_cv_prog_LIPO_FOR_TARGET"
fi fi
else else
...@@ -9623,7 +9643,7 @@ echo "${ECHO_T}no" >&6 ...@@ -9623,7 +9643,7 @@ echo "${ECHO_T}no" >&6
elif test $build != $host && test $have_gcc_for_target = yes; then elif test $build != $host && test $have_gcc_for_target = yes; then
NM_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=nm` NM_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=nm`
test $NM_FOR_TARGET=nm && NM_FOR_TARGET= test $NM_FOR_TARGET=nm && NM_FOR_TARGET=
ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET test -n "$NM_FOR_TARGET" && ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET
fi fi
fi fi
if test -z "$ac_cv_path_NM_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then if test -z "$ac_cv_path_NM_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
...@@ -9819,6 +9839,8 @@ if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then ...@@ -9819,6 +9839,8 @@ if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then
else else
NM_FOR_TARGET="${ncn_target_tool_prefix}$2" NM_FOR_TARGET="${ncn_target_tool_prefix}$2"
fi fi
else
NM_FOR_TARGET="$ac_cv_prog_NM_FOR_TARGET"
fi fi
else else
...@@ -9844,7 +9866,7 @@ echo "${ECHO_T}no" >&6 ...@@ -9844,7 +9866,7 @@ echo "${ECHO_T}no" >&6
elif test $build != $host && test $have_gcc_for_target = yes; then elif test $build != $host && test $have_gcc_for_target = yes; then
OBJDUMP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=objdump` OBJDUMP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=objdump`
test $OBJDUMP_FOR_TARGET=objdump && OBJDUMP_FOR_TARGET= test $OBJDUMP_FOR_TARGET=objdump && OBJDUMP_FOR_TARGET=
ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET test -n "$OBJDUMP_FOR_TARGET" && ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET
fi fi
fi fi
if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
...@@ -10040,6 +10062,8 @@ if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" ; then ...@@ -10040,6 +10062,8 @@ if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" ; then
else else
OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}$2" OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}$2"
fi fi
else
OBJDUMP_FOR_TARGET="$ac_cv_prog_OBJDUMP_FOR_TARGET"
fi fi
else else
...@@ -10065,7 +10089,7 @@ echo "${ECHO_T}no" >&6 ...@@ -10065,7 +10089,7 @@ echo "${ECHO_T}no" >&6
elif test $build != $host && test $have_gcc_for_target = yes; then elif test $build != $host && test $have_gcc_for_target = yes; then
RANLIB_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ranlib` RANLIB_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ranlib`
test $RANLIB_FOR_TARGET=ranlib && RANLIB_FOR_TARGET= test $RANLIB_FOR_TARGET=ranlib && RANLIB_FOR_TARGET=
ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET test -n "$RANLIB_FOR_TARGET" && ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET
fi fi
fi fi
if test -z "$ac_cv_path_RANLIB_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then if test -z "$ac_cv_path_RANLIB_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
...@@ -10261,6 +10285,8 @@ if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then ...@@ -10261,6 +10285,8 @@ if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then
else else
RANLIB_FOR_TARGET="${ncn_target_tool_prefix}$2" RANLIB_FOR_TARGET="${ncn_target_tool_prefix}$2"
fi fi
else
RANLIB_FOR_TARGET="$ac_cv_prog_RANLIB_FOR_TARGET"
fi fi
else else
...@@ -10286,7 +10312,7 @@ echo "${ECHO_T}no" >&6 ...@@ -10286,7 +10312,7 @@ echo "${ECHO_T}no" >&6
elif test $build != $host && test $have_gcc_for_target = yes; then elif test $build != $host && test $have_gcc_for_target = yes; then
STRIP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=strip` STRIP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=strip`
test $STRIP_FOR_TARGET=strip && STRIP_FOR_TARGET= test $STRIP_FOR_TARGET=strip && STRIP_FOR_TARGET=
ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET test -n "$STRIP_FOR_TARGET" && ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET
fi fi
fi fi
if test -z "$ac_cv_path_STRIP_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then if test -z "$ac_cv_path_STRIP_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
...@@ -10482,6 +10508,8 @@ if test -z "$ac_cv_prog_STRIP_FOR_TARGET" ; then ...@@ -10482,6 +10508,8 @@ if test -z "$ac_cv_prog_STRIP_FOR_TARGET" ; then
else else
STRIP_FOR_TARGET="${ncn_target_tool_prefix}$2" STRIP_FOR_TARGET="${ncn_target_tool_prefix}$2"
fi fi
else
STRIP_FOR_TARGET="$ac_cv_prog_STRIP_FOR_TARGET"
fi fi
else else
...@@ -10507,7 +10535,7 @@ echo "${ECHO_T}no" >&6 ...@@ -10507,7 +10535,7 @@ echo "${ECHO_T}no" >&6
elif test $build != $host && test $have_gcc_for_target = yes; then elif test $build != $host && test $have_gcc_for_target = yes; then
WINDRES_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=windres` WINDRES_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=windres`
test $WINDRES_FOR_TARGET=windres && WINDRES_FOR_TARGET= test $WINDRES_FOR_TARGET=windres && WINDRES_FOR_TARGET=
ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET test -n "$WINDRES_FOR_TARGET" && ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET
fi fi
fi fi
if test -z "$ac_cv_path_WINDRES_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then if test -z "$ac_cv_path_WINDRES_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
...@@ -10703,6 +10731,8 @@ if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then ...@@ -10703,6 +10731,8 @@ if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then
else else
WINDRES_FOR_TARGET="${ncn_target_tool_prefix}$2" WINDRES_FOR_TARGET="${ncn_target_tool_prefix}$2"
fi fi
else
WINDRES_FOR_TARGET="$ac_cv_prog_WINDRES_FOR_TARGET"
fi fi
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment