From nobody Mon Jul 24 00:53:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R8M9T6fywz4pJ9c; Mon, 24 Jul 2023 00:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R8M9T6CzNz4FLn; Mon, 24 Jul 2023 00:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690160029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CJwKmNgOIrWuvcJHiRAiod3eA2nwVP6C5Or0sGQO7nQ=; b=c+jjD6IZxNj/SHXnyXkshKiwPW2EcCq1bycHiWTlUB3XexsDnBdbrLvT4XdodlxuxkIDWz a/H29oBkRJTVrWRz+tnkkt3iXTnNManKC+SNJ8i5A4XtetgaCECnP8SRn6Kq9dfRLji3qy 7jg+6ETZP/qa+XHlu3ceMHTY2SP1S5gLPpLJgX/xqQFGsGVmtT0eWdr6sc0pDQBU2A/JPN 6jg6Z3IrFHdItY9poMT8ibRJSHmGA6sOfzEFx74KbkCCVnm8oKJiKwGvdBHq4ogcP0pFBQ Y7dC320QK8OPAwvoT6ZUvcY+DKys1zWZnEgtObFCgsnrYRY9gxPSCohKHgVrUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690160029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CJwKmNgOIrWuvcJHiRAiod3eA2nwVP6C5Or0sGQO7nQ=; b=vBFvqTRORr/OtiKsIu8d6wv2mtKNVOOtA8UvI6IcZWN0t6IFGoS17zipAWPJiCCB1RacSB hpbDJex6m1tIMnMXsB7Zcwryw3/9LdO5fFycYDwSaDFBssuMSyG5NPDbsWzw6GSrdH8uuF 1PtZUiPeS3GrvZw85VpYg4XC16fnSyflmkSHP6tLoQp+h1QDtqvJIqNR2sBI4PiHuGPUVM 8vMY12q2Aj13v7i5/0W54D6UHGaHkerxYu+RRoDxPRVk9bd574uERpiYsDNfWiq9Lb8sI5 mRB7BJNlpbkrmc80VuAHsjvRpqS/0Fc5AQnTyLWSReBGhn4PdHL7Lq+7xV2OLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690160029; a=rsa-sha256; cv=none; b=bD7QB92YcH+kL1UgfBDPiLDVpfByXgqRKJXpvHLttrD3pLrtTNr6r84GRQIos96dHW/NLK UWhIaCRp6dRpnIXiN6nucqWDaePqxguETYdwyx9O1zhYdZ89VFEUbemdD9wO7gln1icZy4 I9eJhVJ/zvnXEt/AXu8HKcXLI2wGPBKG4erowfl+p+ovbuT+2UkZXmRfoeIyyybQESht7m fwElq/X8hVztlA8g2cedprkiR+D2hFfRhMBXC/q6a55O8t/v5N52pPI59p6HRsaqERUPja OFjwC6Vsb2sjmtIte+GGC0XQbCTQ1QxUd9BhwQhq7ovlKD3f3tmng6mHa2cagQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R8M9T5HyQzyBJ; Mon, 24 Jul 2023 00:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36O0rnHQ005561; Mon, 24 Jul 2023 00:53:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36O0rnkD005560; Mon, 24 Jul 2023 00:53:49 GMT (envelope-from git) Date: Mon, 24 Jul 2023 00:53:49 GMT Message-Id: <202307240053.36O0rnkD005560@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 7f9318a022ef - main - bsd.linker.mk: Use :C not :S for regex List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f9318a022ef0e5104fd429dc2d9ac37b9916353 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=7f9318a022ef0e5104fd429dc2d9ac37b9916353 commit 7f9318a022ef0e5104fd429dc2d9ac37b9916353 Author: Jessica Clarke AuthorDate: 2023-07-24 00:50:55 +0000 Commit: Jessica Clarke CommitDate: 2023-07-24 00:50:55 +0000 bsd.linker.mk: Use :C not :S for regex Whilst ^ and $ are supported with C, those are special cases, and general regex syntax like groups and alternations are not. Use the correct modifier so we get a version number out that's not 0 (which is what happens when it can't be parsed by the later code). Fixes: c4177f5b41d4 ("bsd.linker.mk: Handle Xcode 15 linker identification") MFC after: 1 week --- share/mk/bsd.linker.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/bsd.linker.mk b/share/mk/bsd.linker.mk index 2a572fa01bcd..1086642ffb57 100644 --- a/share/mk/bsd.linker.mk +++ b/share/mk/bsd.linker.mk @@ -82,7 +82,7 @@ ${X_}LINKER_FREEBSD_VERSION= 0 .elif ${_ld_version:[1]:S/-classic$//} == "@(\#)PROGRAM:ld" # bootstrap linker on MacOS ${X_}LINKER_TYPE= mac -_v= ${_ld_version:[2]:S/PROJECT:(ld64|dyld)-//} +_v= ${_ld_version:[2]:C/PROJECT:(ld64|dyld)-//} # Convert version 409.12 to 409.12.0 so that the echo + awk below works .if empty(_v:M[1-9]*.[0-9]*.[0-9]*) && !empty(_v:M[1-9]*.[0-9]*) _v:=${_v}.0