From nobody Sat Nov 1 01:18:47 2025 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 4cz0Nl5SP1z6FZXr; Sat, 01 Nov 2025 01:18:47 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cz0Nl3VkGz3qKK; Sat, 01 Nov 2025 01:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761959927; 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=1OG9MglZ7L0UL0xTzvskRKnj7cw6n+6PLamWwkPxA/g=; b=R5A3a0cLLKLb13xxwojQcDeYxcJb4bP9TiICr3rByNrCAOeEaSwrFXGqkeXvXK68R/bYrh 3wQLmbqvq0G57900sSD5zdWlIsq9V/mJfN/R05GU1CYvGNFR5+pnP8Qqsym420vdl1N6kg FBwGsQIgMQcOc1/CP18F8vDD/k03gdoKLYehj4OpoQmIZ7zP1u7dKuPBXzivR3Zm3+b2PB DCSV0rMeZMnZ3+d9UDefzkfJVrZApxoPvy2VgALYKkB3pqiIfzKV6ma3o8f0fxz3MxLv3j Dlvzx4I/sP3+VkSL6qxBE6BCGiYp/jM655JOz2sqKJlzx17z5BH8Yw2/3ghUSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761959927; 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=1OG9MglZ7L0UL0xTzvskRKnj7cw6n+6PLamWwkPxA/g=; b=qXy7qkmOSBE06RZlxpzCyZm2sospghM7aahDW1hcdff+2RMb/gjVaCbmQcORdedxR/3rmt +u7m4BxUaeYMwhZyrs06WGW36/p4IVJGtcsp5XOi9plLBvZpEc6KA5W3gvmF/qgAxzb2mb WrB2QD7GPs3QcSQ4SSTD32dFb5FDI/NWeiHBEQFdMAFUvJoty+QrYZCQP7t2QDcYTo5ybK HwRn/+LbszKlUisVyIZ2Ss5bG/djhgzYpD57TMvJ2YFMExrh8G2eh35Xf5YzLt4rXr/36c GKmhMJa+2RX7NGD6pNDENZhYvzoUzzKwR8I51tH8Bdjri9i1q3QWJKvfv+tE0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761959927; a=rsa-sha256; cv=none; b=ZtydnxpGCzyH/4XBdWAs5hcGJzLmp2+KjAeqijHSVGPTnqHfDt54U8AYzUr/nN8ndtyVKK EWHOCtFkG4rDovaV/S5/ycAs677QRzUbrs/adBqmgKhWEly4EcDV1ZAUnm8LnU7ZeMCD+x qXPF5jPGWBur6GEi2d4WzN3Ap8KvMDUAFOcOxle39Pg7TYomBOem/+7lcZOoHQLRwFsXuE fiZHK1ENeQNv2UPfHWeYL6dNjt77qAOvnF9B+v+IoAXcW2Op688uROZ/yQWWsRcIcCsNp0 UYpT57k26VbugzeSsDM72NvWMinfEqDHurJPxpusleXZ7xhALXMrQQaWzqGUQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cz0Nl36BBz209; Sat, 01 Nov 2025 01:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A11Ile4059449; Sat, 1 Nov 2025 01:18:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A11IlND059446; Sat, 1 Nov 2025 01:18:47 GMT (envelope-from git) Date: Sat, 1 Nov 2025 01:18:47 GMT Message-Id: <202511010118.5A11IlND059446@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e4f2a3509554 - main - bsd.prog.mk: Skip warnings if compiler.mk was not included 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4f2a350955406ffd58dd3f0bb7610df0f36d647 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e4f2a350955406ffd58dd3f0bb7610df0f36d647 commit e4f2a350955406ffd58dd3f0bb7610df0f36d647 Author: Ed Maste AuthorDate: 2025-10-31 15:53:42 +0000 Commit: Ed Maste CommitDate: 2025-11-01 01:17:11 +0000 bsd.prog.mk: Skip warnings if compiler.mk was not included We emit a warning if src.conf options WITH_RETPOLINE or INIT_ALL are in use, and the compiler or linker does not support the feature. For targets like `cleandir` we skip including bsd.compiler.mk, which leaves COMPILER_FEATURES unset and spurious warnings were emitted in early buildworld stages, if these options are in use. Commit 0837b2ebd570 ("pkg: Die if make -V BRANCH fails") added -W to usr.sbin/pkg's make flags, causing it to exit on warnings. As a result buildworld failed when these src.conf options were in use. Clean this up by omitting the warning if the magic _NO_INCLUDE_COMPILERMK flag is set, which indicates that COMPILER_FEATURES is not set. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53501 --- share/mk/bsd.prog.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 10e1c177e2b2..5697845079e2 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -49,9 +49,11 @@ CXXFLAGS+= -mretpoline LDFLAGS+= -Wl,-zretpolineplt .endif .else +.if !defined(_NO_INCLUDE_COMPILERMK) .warning Retpoline requested but not supported by compiler or linker .endif .endif +.endif # LLD sensibly defaults to -znoexecstack, so do the same for BFD LDFLAGS.bfd+= -Wl,-znoexecstack .if ${MK_BRANCH_PROTECTION} != "no" @@ -71,9 +73,11 @@ CFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clan CXXFLAGS+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang .endif .else +.if !defined(_NO_INCLUDE_COMPILERMK) .warning INIT_ALL (${OPT_INIT_ALL}) requested but not supported by compiler .endif .endif +.endif # Zero used registers on return (mitigate some ROP) .if ${MK_ZEROREGS} != "no"