Skip to content

Commit dc17e75

Browse files
committed
build: Use of cargo not yet supported here in Canadian cross configurations
..., 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.
1 parent 3ebc789 commit dc17e75

File tree

2 files changed

+25
-0
lines changed

2 files changed

+25
-0
lines changed

configure

+13
Original file line numberDiff line numberDiff line change
@@ -9148,6 +9148,19 @@ $as_echo "$as_me: WARNING: --enable-host-shared required to build $language" >&2
91489148
;;
91499149
esac
91509150

9151+
# Pre-conditions to consider whether cargo being supported.
9152+
if test x"$have_cargo" = xyes \
9153+
&& test x"$build" != x"$host"; then
9154+
# Until <https://github.com/Rust-GCC/gccrs/issues/2898>
9155+
# "'cargo' should build for the host system" is resolved:
9156+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: use of cargo not yet supported here in Canadian cross configurations" >&5
9157+
$as_echo "$as_me: WARNING: use of cargo not yet supported here in Canadian cross configurations" >&2;}
9158+
have_cargo=no
9159+
else
9160+
# Assume that cargo-produced object files are compatible with what
9161+
# we're going to build here.
9162+
:
9163+
fi
91519164
# Disable Rust if cargo is unavailable.
91529165
case ${add_this_lang}:${language}:${have_cargo} in
91539166
yes:rust:no)

configure.ac

+12
Original file line numberDiff line numberDiff line change
@@ -2306,6 +2306,18 @@ directories, to avoid imposing the performance cost of
23062306
;;
23072307
esac
23082308

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

0 commit comments

Comments
 (0)