From nobody Tue Aug 01 21:06:55 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 4RFnjb0rBxz4prQH; Tue, 1 Aug 2023 21:06:56 +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 4RFnjX0J0Yz3LlM; Tue, 1 Aug 2023 21:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924016; 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=Bqpdw8vLR+e4UmX67jV67Vk6tWHx9f9dvJm8PXGh6DA=; b=pH5QVLVZ4AWiLfPrbECwyL2yoqVC8edHmpDStw9/24KekfSGSXgCCRy3JXUEi5ueC5juO5 1Sg/9QXxwuXI7Ak82mk/KwIyl6VuJT5ct6Kfd2VnkTrVYk7egK4SJrSRp+I5R8sBp3GyM0 3I+VDyD3K0jKm1KPR47eTfjHrnNtWKMonl8e5mQadv9MzMoeDLTD7YX/v9jLIBOxR51KfW NRCIEQfWfOq23OPS8uUH7Yw6gUru/w0nrANFueODb5fi6oett27rUCzMirxZgPKJoU8YVS M7v/Wk6VttegU/G94K85Tf9OL0Tucu8zPZMLbVNaBVWtUb+Zhx2e1P5m+V81sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924016; a=rsa-sha256; cv=none; b=weiAE0nw53EawFXIGbdhIv288x68huhk8kOnDBvyqkcqdpopTXEpLt6WjwLY6TtASZiVEV 6t7DguktVS5913S0DBzbT24s5GCVGE46tfYzHLH8Smj5LXMzs4VVrh1R6xfG/VOWjLYrNE ZM31XsHEowpxlKUqmbulsBpyRbrHPj7TD5QOYk0nTwgvWivdE+c8dUSDRrGikMWd0Al+6R p7I1vG1y4Z/dXz8Pnvh7Cv/Sl5yQMaMYwQEYlcA83dnjQl9kWaPH1jnmj9dZ8cgIvb6jf8 ErfYHj2hVC+jLCgTSgkIj7fnjWVhfkvIXvQcEIueYZCtoWpYoxM57hd43nGsFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924016; 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=Bqpdw8vLR+e4UmX67jV67Vk6tWHx9f9dvJm8PXGh6DA=; b=vS31ssmYm350pys8elDEyJjEZWdoUUbsY5DQw4vK70gcFL9WIuzHuceMeDbe/l878jBPkW Lz+cEcIX8bF4CIwt9x+pkYrsakj4GYxFgcywnA4E6iL3s5yZiCczUpVBkf2mV2LN00rvxJ S8avDEOq3f2tHVraIpk1fZPUbFPYliL1/Zluu+nRqcnTZGU5pXBJqNMm6o/zuRfbKbJ6Vd IGMdsN1FWZGqblozxjlAB1LRYQvZWiufJzrlBQd+eLUOxzpDxuDyU891ng+w/MifM0TpBC 1ophKM44r7ORRg5SiNQLFFk5ClD24MbW8IO1P7JB7o2KugF0T/fo6e7sq5AygA== 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 4RFnjW6FWZzsq6; Tue, 1 Aug 2023 21:06:55 +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 371L6tXr013989; Tue, 1 Aug 2023 21:06:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6tRt013988; Tue, 1 Aug 2023 21:06:55 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:55 GMT Message-Id: <202308012106.371L6tRt013988@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 2c6eebc109a0 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2c6eebc109a061803c883596a3b1da8fc4c0c866 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=2c6eebc109a061803c883596a3b1da8fc4c0c866 commit 2c6eebc109a061803c883596a3b1da8fc4c0c866 Author: Jessica Clarke AuthorDate: 2023-07-24 00:50:55 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:53 +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 (cherry picked from commit 7f9318a022ef0e5104fd429dc2d9ac37b9916353) --- 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 bcbdc0c1131d..bbee6f31959d 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