mirror/gcc
1
0
Fork 0
mirror of https://github.com/gcc-mirror/gcc.git synced 2024-11-21 13:40:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: Don't check for host-prefixed 'cargo' program

Browse Source 
Follow-up to commit 3e1e73fc99
"build: Check for cargo when building rust language":

On 2024-04-15T13:14:42+0200, I wrote:
> I now wonder: instead of 'AC_CHECK_TOOL', shouldn't this use
> 'AC_CHECK_PROG'?  (We always want plain 'cargo', not host-prefixed
> 'aarch64-linux-gnu-cargo' etc., right?)  I'll look into changing this.

	* configure: Regenerate.
	config/
	* acx.m4 (ACX_PROG_CARGO): Use 'AC_CHECK_PROGS'.
This commit is contained in:
Thomas Schwinge 2024-04-15 13:33:48 +02:00
parent 79ff53453e
commit 3ebc7898a5
2 changed files with 8 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/acx.m4
View File

@ -427,8 +427,7 @@ fi
# Test for Rust # Test for Rust
# We require cargo and rustc for some parts of the rust compiler. # We require cargo and rustc for some parts of the rust compiler.
AC_DEFUN([ACX_PROG_CARGO], AC_DEFUN([ACX_PROG_CARGO],
[AC_REQUIRE([AC_CHECK_TOOL_PREFIX]) [AC_CHECK_PROGS(CARGO, cargo, no)
AC_CHECK_TOOL(CARGO, cargo, no)
if test "x$CARGO" != xno; then if test "x$CARGO" != xno; then
have_cargo=yes have_cargo=yes
else else

64
configure vendored
View File

@ -5787,10 +5787,10 @@ else
have_gdc=no have_gdc=no
fi fi
for ac_prog in cargo
if test -n "$ac_tool_prefix"; then do
# Extract the first word of "${ac_tool_prefix}cargo", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy ${ac_tool_prefix}cargo; ac_word=$2 set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_CARGO+:} false; then : if ${ac_cv_prog_CARGO+:} false; then :
@ -5806,7 +5806,7 @@ do
test -z "$as_dir" && as_dir=. test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CARGO="${ac_tool_prefix}cargo" ac_cv_prog_CARGO="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2 break 2
fi fi
@ -5826,59 +5826,9 @@ $as_echo "no" >&6; }
fi fi
fi test -n "$CARGO" && break
if test -z "$ac_cv_prog_CARGO"; then
ac_ct_CARGO=$CARGO
# Extract the first word of "cargo", so it can be a program name with args.
set dummy cargo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_ac_ct_CARGO+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CARGO"; then
ac_cv_prog_ac_ct_CARGO="$ac_ct_CARGO" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CARGO="cargo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done done
done test -n "$CARGO" || CARGO="no"
IFS=$as_save_IFS
fi
fi
ac_ct_CARGO=$ac_cv_prog_ac_ct_CARGO
if test -n "$ac_ct_CARGO"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CARGO" >&5
$as_echo "$ac_ct_CARGO" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "x$ac_ct_CARGO" = x; then
CARGO="no"
else
case $cross_compiling:$ac_tool_warned in
yes:)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CARGO=$ac_ct_CARGO
fi
else
CARGO="$ac_cv_prog_CARGO"
fi
if test "x$CARGO" != xno; then if test "x$CARGO" != xno; then
have_cargo=yes have_cargo=yes