From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tromey@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2126)
 id F20CE3858C2C; Fri, 15 Apr 2022 17:35:46 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F20CE3858C2C
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Tom Tromey <tromey@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] Match rustc beta versions
X-Act-Checkin: binutils-gdb
X-Git-Author: Tom Tromey <tom@tromey.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 3b9809bc62cd0ff2aff2232b68adc6bb82eee61b
X-Git-Newrev: 7410508723bf20c29ea8d5888eee9c45e5fae0a2
Message-Id: <20220415173546.F20CE3858C2C@sourceware.org>
Date: Fri, 15 Apr 2022 17:35:46 +0000 (GMT)
X-BeenThere: gdb-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gdb-cvs mailing list <gdb-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/gdb-cvs>,
 <mailto:gdb-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/gdb-cvs/>
List-Help: <mailto:gdb-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/gdb-cvs>,
 <mailto:gdb-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Apr 2022 17:35:47 -0000

https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D7410508723bf=
20c29ea8d5888eee9c45e5fae0a2

commit 7410508723bf20c29ea8d5888eee9c45e5fae0a2
Author: Tom Tromey <tom@tromey.com>
Date:   Fri Mar 25 13:36:32 2022 -0600

    Match rustc beta versions
   =20
    The rust_compiler_version proc extracts the Rust compiler version from
    the "rustc --version" output.  For a beta compiler, the output looks
    like:
   =20
        rustc 1.60.0-beta.6 (7bccde197 2022-03-22)
   =20
    This patch slightly relaxes the regexp -- removing a space -- so that
    this can be understood by this proc.

Diff:
---
 gdb/testsuite/lib/rust-support.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/testsuite/lib/rust-support.exp b/gdb/testsuite/lib/rust-su=
pport.exp
index 0d39566df73..85e5b021e21 100644
--- a/gdb/testsuite/lib/rust-support.exp
+++ b/gdb/testsuite/lib/rust-support.exp
@@ -104,7 +104,7 @@ gdb_caching_proc rust_compiler_version {
     } else {
 	set output [lindex [remote_exec host "$rustc --version --verbose"] 1]
 	foreach line [split $output \n] {
-	    if {[regexp "rustc (\[0-9.\]+) .*\$" $output ignore version]} {
+	    if {[regexp "rustc (\[0-9.\]+).*\$" $output ignore version]} {
 		return $version
 	    }
 	}