aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <tschwinge@baylibre.com>2024-04-15 14:27:45 +0200
committerThomas Schwinge <tschwinge@baylibre.com>2024-04-16 09:43:47 +0200
commitdc17e7544ef419b3f777b469a2668b26b31d2150 (patch)
tree5de91158ef2beea20826d2b405abc059fbb7f8b8
parent3ebc7898a55988e84ab3625700a827e3e82b016f (diff)
downloadgcc-dc17e7544ef419b3f777b469a2668b26b31d2150.zip
gcc-dc17e7544ef419b3f777b469a2668b26b31d2150.tar.gz
gcc-dc17e7544ef419b3f777b469a2668b26b31d2150.tar.bz2
build: Use of cargo not yet supported here in Canadian cross configurations
..., until <https://github.com/Rust-GCC/gccrs/issues/2898> "'cargo' should build for the host system" is resolved. Follow-up to commit 3e1e73fc99584440e5967577f2049573eeaf4596 "build: Check for cargo when building rust language". * configure.ac (have_cargo): Force to "no" in Canadian cross configurations * configure: Regenerate.
-rwxr-xr-xconfigure13
-rw-r--r--configure.ac12
2 files changed, 25 insertions, 0 deletions
diff --git a/configure b/configure
index 1a5513c..3b0abeb 100755
--- a/configure
+++ b/configure
@@ -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)
diff --git a/configure.ac b/configure.ac
index a0191e5..042681c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)