JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* acx.m4 (ACX_CHECK_INSTALLED_TARGET_TOOL): Fixup logic for cross

Browse Source 
builds.

	    * acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Fix incremental builds.
	    (ACX_HAVE_GCC_FOR_TARGET): Likewise.
This commit is contained in:
Mike Stump 2007-07-02 18:06:53 +00:00
parent 5ee15d270d
commit d058b81b19
3 changed files with 64 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/ChangeLog
View File

@ -1,3 +1,13 @@
2007-06-27 Mike Stump <mrs@apple.com>
* acx.m4 (ACX_CHECK_INSTALLED_TARGET_TOOL): Fixup logic for cross
builds.
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.

6
config/acx.m4
View File

@ -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
@ -324,8 +326,8 @@ if test -z "$ac_cv_path_$1" ; then
fi fi
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

70
configure vendored
View File

@ -7878,6 +7878,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
@ -8031,6 +8033,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
@ -8179,6 +8183,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
@ -8332,6 +8338,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
@ -8485,6 +8493,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
@ -8520,8 +8530,8 @@ echo "${ECHO_T}no" >&6
fi fi
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
@ -8717,6 +8727,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
@ -8741,8 +8753,8 @@ echo "${ECHO_T}no" >&6
fi fi
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
@ -8938,6 +8950,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
@ -8962,8 +8976,8 @@ echo "${ECHO_T}no" >&6
fi fi
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
@ -9159,6 +9173,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
@ -9183,8 +9199,8 @@ echo "${ECHO_T}no" >&6
fi fi
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
@ -9380,6 +9396,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
@ -9404,8 +9422,8 @@ echo "${ECHO_T}no" >&6
fi fi
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
@ -9601,6 +9619,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
@ -9625,8 +9645,8 @@ echo "${ECHO_T}no" >&6
fi fi
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
@ -9822,6 +9842,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
@ -9846,8 +9868,8 @@ echo "${ECHO_T}no" >&6
fi fi
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
@ -10043,6 +10065,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
@ -10067,8 +10091,8 @@ echo "${ECHO_T}no" >&6
fi fi
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
@ -10264,6 +10288,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
@ -10288,8 +10314,8 @@ echo "${ECHO_T}no" >&6
fi fi
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
@ -10485,6 +10511,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
@ -10509,8 +10537,8 @@ echo "${ECHO_T}no" >&6
fi fi
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
@ -10706,6 +10734,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