Skip to content

Commit

Permalink
build: Use of cargo not yet supported here in Canadian cross configur…
Browse files Browse the repository at this point in the history
…ations

..., until <Rust-GCC/gccrs#2898>
"'cargo' should build for the host system" is resolved.

Follow-up to commit 3e1e73f
"build: Check for cargo when building rust language".

	* configure.ac (have_cargo): Force to "no" in Canadian cross
	configurations
	* configure: Regenerate.
  • Loading branch information
tschwinge committed Apr 16, 2024
1 parent 3ebc789 commit dc17e75
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
13 changes: 13 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -9148,6 +9148,19 @@ $as_echo "$as_me: WARNING: --enable-host-shared required to build $language" >&2
;;
esac

# Pre-conditions to consider whether cargo being supported.
if test x"$have_cargo" = xyes \
&& test x"$build" != x"$host"; then
# Until <https://github.com/Rust-GCC/gccrs/issues/2898>
# "'cargo' should build for the host system" is resolved:
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: use of cargo not yet supported here in Canadian cross configurations" >&5
$as_echo "$as_me: WARNING: use of cargo not yet supported here in Canadian cross configurations" >&2;}
have_cargo=no
else
# Assume that cargo-produced object files are compatible with what
# we're going to build here.
:
fi
# Disable Rust if cargo is unavailable.
case ${add_this_lang}:${language}:${have_cargo} in
yes:rust:no)
Expand Down
12 changes: 12 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2306,6 +2306,18 @@ directories, to avoid imposing the performance cost of
;;
esac

# Pre-conditions to consider whether cargo being supported.
if test x"$have_cargo" = xyes \
&& test x"$build" != x"$host"; then
# Until <https://github.com/Rust-GCC/gccrs/issues/2898>
# "'cargo' should build for the host system" is resolved:
AC_MSG_WARN([use of cargo not yet supported here in Canadian cross configurations])
have_cargo=no
else
# Assume that cargo-produced object files are compatible with what
# we're going to build here.
:
fi
# Disable Rust if cargo is unavailable.
case ${add_this_lang}:${language}:${have_cargo} in
yes:rust:no)
Expand Down

0 comments on commit dc17e75

Please sign in to comment.