From patchwork Fri Nov 22 20:57:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 101771 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 47B113858C42 for ; Fri, 22 Nov 2024 20:58:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 47B113858C42 X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id DB20E3858416; Fri, 22 Nov 2024 20:57:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DB20E3858416 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DB20E3858416 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732309080; cv=none; b=ODS8RfiHcmWOentDGdTp0x7cq30GVwMFlho5CS7QW8ErqxlfbPPubq7m7X+S6RpjWRebkImoJ/3gp4CRiVfDU7WXnpjqsgdUD2lcZV5qsC/26abzw9uRLCBB0gS7P0PrkTXL0MA3oMa7/xldStFaGdfeKDtjihmyUJirPpWx1K8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732309080; c=relaxed/simple; bh=bJd++5kJtotXENDA8CrFVGx58kgqQI7LBY0yj1Ra7FE=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=OAK/d2JWeNTJnFbk8rUomxeUx6ijRhKrO3z1aAZf3xUWb6h7pHsXeyrS/lhDcEveUUu6Du5Cs1bpT07QluN79387I5HykfKR3IPWRIc6GntCPEf38qFxt2Ir1rkC/sVRWhdddIUPXHHEJIFio834X7xoq/D8lNOAZW/VlLY8GIw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DB20E3858416 From: Sam James To: binutils@sourceware.org, gdb-patches@sourceware.org Cc: Sam James Subject: [COMMITTED] Sync toplevel configure fixup Date: Fri, 22 Nov 2024 20:57:37 +0000 Message-ID: <12db6ae4452b322312ae74f06d754ede1a978b35.1732309057.git.sam@gentoo.org> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org Apparently I missed that we needed to sync config/acx.m4. I only noticed this because our packaging has a grep for certain messages post-merge. ``` work/binutils/configure: 5814: ACX_PROG_CARGO: not found ``` Fix that by syncing the macro too, which I missed in 987db70acefd0b223a8df2240d4e5ca544cc0a91. --- Committed as obvious. Sorry for missing that. config/acx.m4 | 10 ++++++++++ configure | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 1 deletion(-) base-commit: ab8c2180a3de1461f361c75c420e4d37ac709e0b diff --git a/config/acx.m4 b/config/acx.m4 index 69f4bfa4d76..db54ccf1c7c 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -424,6 +424,16 @@ else fi ]) +# Test for Rust +# We require cargo and rustc for some parts of the rust compiler. +AC_DEFUN([ACX_PROG_CARGO], +[AC_CHECK_PROGS(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 bdff1f559a4..d6b4ea5094a 100755 --- a/configure +++ b/configure @@ -716,6 +716,7 @@ PGO_BUILD_GEN_CFLAGS HAVE_CXX14_FOR_BUILD HAVE_CXX14 do_compare +CARGO GDC GNATMAKE GNATBIND @@ -5811,7 +5812,54 @@ else have_gdc=no fi -ACX_PROG_CARGO +for ac_prog in cargo +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; 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_prog" + $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 + + + test -n "$CARGO" && break +done +test -n "$CARGO" || CARGO="no" + +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 :