]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
build: Use of cargo not yet supported here in Canadian cross configurations
authorThomas Schwinge <tschwinge@baylibre.com>
Mon, 15 Apr 2024 12:27:45 +0000 (14:27 +0200)
committerThomas Schwinge <tschwinge@baylibre.com>
Tue, 16 Apr 2024 07:43:47 +0000 (09:43 +0200)
..., 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.

configure
configure.ac

index 1a5513ce061a02ae4a0a87252bdba2a294479d3d..3b0abeb8b2e495ff99057c0948043cb3095abe68 100755 (executable)
--- 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)
index a0191e5c1e041826b065e014f47f60b551900220..042681c27be59fcc991a5bd573134ebadc1c05b5 100644 (file)
@@ -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)