From patchwork Mon Apr 8 16:33:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Emmanuel Patry X-Patchwork-Id: 88182 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8132F3858C32 for ; Mon, 8 Apr 2024 16:39:36 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id 007D33858CDA for ; Mon, 8 Apr 2024 16:39:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 007D33858CDA Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 007D33858CDA Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712594345; cv=none; b=e+ecQ+cHpIukVCPr8o3A1F/kgfxVrWsUVCeJy/+fgDEU/MCv3G/g8b82O3H3e/Ge6pILesCoAZkko5EFSpQjEHjFE3G2pCuq3hzpBrsRiuU7MEnO6FEaIiuxGdq0ew8fe5vyQOvHvVTvelM0pnFqj3f9EihMIhePnayH1NagpmY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712594345; c=relaxed/simple; bh=RLg8wzTdwtw+BBRrxfFl6k1N6bs5m9Fg/JwuJIz1GJw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=GZ/gAfU4n1A1xnkTQBsfybjA3zpZt/q5VzFwnk3OUKQZoEAiyYeYdOg0i+eVQOO14MB1mSSgpEq3iRKySi9jA8/B0KYEwbiUXpFeGdhXUL3R5gtvZHqpXTWVjQ0Xa8rMqAc86v+R80wiPYPIWLUqH0M9Z7MJwG+hyFZh0J/+gR4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-34339f01cd2so3508251f8f.2 for ; Mon, 08 Apr 2024 09:39:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1712594342; x=1713199142; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=rVnUHiNSvNlGoKggWCsIvnSnWrf74d8AM3OqcLR3nk4=; b=PpLL1OAW/HgLfbIfVoqJsIJ+FlFMvoCneAJmdiXgiaXnhj8DeZStNCjiJieHlyL3Mu MU1mg0BDyhJf/FBPCXnteLF4QI0A2ib8eCCtYhcvIEZ3qqH8LGr846wQi2iLo8aduEFr E19p2XYdqyVtbLCWsRXlQwOeUCdf/4AAYy2EpOH/7KsCPTgtaeN8B6y1ZszTwM0e1g3m IephAiAgHvIIT6Wi6vIC+TnmpYtRE0yNscr3gL4FoBqwPDRNKwUqrR1gcOpvYe+5LySG q9NuSQbNTaWABeXFkC34DP8m7lhgEfk1LfaTT7NoFCOILzUgTuQCY21rtJ6sKrdpkWhv wK5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712594342; x=1713199142; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rVnUHiNSvNlGoKggWCsIvnSnWrf74d8AM3OqcLR3nk4=; b=rhKuNwMDE+HfFHX+REotYudX2RRKeTYvpkJiFPv24V7HfNfTTBhIi/ZcNlFiVW8ap5 6u+XIgfDAvLCqWNVIIzp39mineB+2MjJ0zEV99s5enJWbtnpbzKQoZWGdbJK+K+hYHAp w+BoizEk8pkqNkQiwG+e3Nq36qO/ufunueVPr+0tCUl3G929mCPxfy5YWUAgE5uP+nYx lIDZBN5gmsck0YNQyobjJ7U3OgHaxO9uzGgt7tcQr96bz9IwkrjQqohAfroe54untKlQ qh+GnS7gog85xTfJsHZjpaS7cY4WVmzl6MAWqtNcxzJK3qWye3lgLCUhJFkVrSdg2a8P KjBA== X-Gm-Message-State: AOJu0YwVeVKYdbwvctH2WmKjl2u7NkHwlgkmeubdTKxM/8T1BHAgDaaa IOzPxBQAh2KRKtT5eYUUumb/pjsk118lAmnTOKKop5BgT3P9LTl3UOl5B7RMMakj8H+WpLGrV2j 3Gxmy2A== X-Google-Smtp-Source: AGHT+IEviJoFyaPdjiaMDVAXJbTZzWjOeRRwJAQLVvfb1yVTRRdt4la6dEt8svlq9U7Hdfw++/WTlA== X-Received: by 2002:a05:6000:239:b0:345:66a1:d92d with SMTP id l25-20020a056000023900b0034566a1d92dmr3535438wrz.29.1712594341870; Mon, 08 Apr 2024 09:39:01 -0700 (PDT) Received: from localhost.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id o16-20020a056000011000b00343b252b096sm9352724wrx.23.2024.04.08.09.39.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 09:39:01 -0700 (PDT) From: pierre-emmanuel.patry@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Pierre-Emmanuel Patry Subject: [PATCH] build: Check for cargo when building rust language Date: Mon, 8 Apr 2024 18:33:38 +0200 Message-ID: <20240408163337.303317-2-pierre-emmanuel.patry@embecosm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org From: Pierre-Emmanuel Patry Hello, The rust frontend requires cargo to build some of it's components, it's presence was not checked during configuration. Best regards, Pierre-Emmanuel ---------- Prevent rust language from building when cargo is missing. config/ChangeLog: * acx.m4: Add a macro to check for rust components. ChangeLog: * configure: Regenerate. * configure.ac: Emit an error message when cargo is missing. Signed-off-by: Pierre-Emmanuel Patry --- config/acx.m4 | 11 +++++ configure | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 18 ++++++++ 3 files changed, 146 insertions(+) diff --git a/config/acx.m4 b/config/acx.m4 index 7efe98aaf96..3c5fe67342e 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -424,6 +424,17 @@ else fi ]) +# Test for Rust +# We require cargo and rustc for some parts of the rust compiler. +AC_DEFUN([ACX_PROG_CARGO], +[AC_REQUIRE([AC_CHECK_TOOL_PREFIX]) +AC_CHECK_TOOL(CARGO, cargo, no) +if test "x$CARGO" != xno; then + have_cargo=yes +else + have_cargo=no +fi]) + # Test for D. AC_DEFUN([ACX_PROG_GDC], [AC_REQUIRE([AC_CHECK_TOOL_PREFIX]) diff --git a/configure b/configure index 874966fb9f0..46e66e20197 100755 --- a/configure +++ b/configure @@ -714,6 +714,7 @@ PGO_BUILD_GEN_CFLAGS HAVE_CXX11_FOR_BUILD HAVE_CXX11 do_compare +CARGO GDC GNATMAKE GNATBIND @@ -5786,6 +5787,104 @@ else have_gdc=no fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cargo", so it can be a program name with args. +set dummy ${ac_tool_prefix}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_CARGO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CARGO"; then + ac_cv_prog_CARGO="$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_CARGO="${ac_tool_prefix}cargo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CARGO=$ac_cv_prog_CARGO +if test -n "$CARGO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CARGO" >&5 +$as_echo "$CARGO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +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 +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 + have_cargo=yes +else + have_cargo=no +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to compare bootstrapped objects" >&5 $as_echo_n "checking how to compare bootstrapped objects... " >&6; } if ${gcc_cv_prog_cmp_skip+:} false; then : @@ -9099,6 +9198,24 @@ $as_echo "$as_me: WARNING: --enable-host-shared required to build $language" >&2 ;; esac + # Disable Rust if cargo is unavailable. + case ${add_this_lang}:${language}:${have_cargo} in + yes:rust:no) + # Specifically requested language; tell them. + as_fn_error $? "cargo is required to build $language" "$LINENO" 5 + ;; + all:rust:no) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cargo is required to build $language" >&5 +$as_echo "$as_me: WARNING: cargo is required to build $language" >&2;} + add_this_lang=unsupported + ;; + *:rust:no) + # Silently disable. + add_this_lang=unsupported + ;; + esac + + # Disable a language that is unsupported by the target. case "${add_this_lang}: $unsupported_languages " in no:*) ;; diff --git a/configure.ac b/configure.ac index 4f34004a072..8c33c89d02c 100644 --- a/configure.ac +++ b/configure.ac @@ -1411,6 +1411,7 @@ fi ACX_PROG_GNAT ACX_PROG_GDC +ACX_PROG_CARGO ACX_PROG_CMP_IGNORE_INITIAL AC_ARG_ENABLE([bootstrap], @@ -2305,6 +2306,23 @@ directories, to avoid imposing the performance cost of ;; esac + # Disable Rust if cargo is unavailable. + case ${add_this_lang}:${language}:${have_cargo} in + yes:rust:no) + # Specifically requested language; tell them. + AC_MSG_ERROR([cargo is required to build $language]) + ;; + all:rust:no) + AC_MSG_WARN([cargo is required to build $language]) + add_this_lang=unsupported + ;; + *:rust:no) + # Silently disable. + add_this_lang=unsupported + ;; + esac + + # Disable a language that is unsupported by the target. case "${add_this_lang}: $unsupported_languages " in no:*) ;;