From nobody Mon Nov 03 22:00:46 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 4d0lrt4LLBz6FsD4; Mon, 03 Nov 2025 22:00:46 +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 4d0lrt23rqz3YrY; Mon, 03 Nov 2025 22:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762207246; 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=bqEHrqyT+HXxO9T9jx1UFdkrClZEbJBR3aoQ2PoYZ1c=; b=GvNEcsW7NLxrNx8AOz5ml/bbTnnf5jbUyyQTm5cGAtoACXteCkMpSMpKiRQ2601lPhd3+N Uy/Z1LstlPdGSEbmQ6BSfN5qOlbi90XCm/V+T90A1zvyjnCInJp0m8iGaug4+98AdynkQD uMnr5cMhe4c5tXRPkkniSSHP2bAgrrwsDgzz4ZZn0fXaBWjV6U2kIQ9TYyq3aCOZ2669ee BuXCeWIKqb4PLIHD/d5vJ1z5vQY6k/HAB7JKF9qANFz4kC5+HVlsaKgbgxEPDezvtOj+ww zSGWvUUrBLAUleABjz2nbkre93M6u0VAlQUtwcdTIhFp5FkUVWoUilQWT879NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762207246; 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=bqEHrqyT+HXxO9T9jx1UFdkrClZEbJBR3aoQ2PoYZ1c=; b=vMwuXdCzTmvDd2NPdCS09tUY9lxwpmuIxMVDAyTwyU5Ecgxo/KfcyexFh4RVqiThhln//q 0CnqujX+g5PKhiawzmuPg8YwJ8bJB3hNHlODcWKt4R0Uwlcxxr3AmvVzPO7mi556VrtWOj 5dqhzKby9e/cWxPAHdBjX8XG7D+5s8iw+BQDIdTZm+Ku1zoMqFh+N77ERL+FRQGeBe0goF GcDfRkdyUoBRb5YMqfsk8RdWW/8eR+ts4RAiKEjjzHq9119LtRo9luN6S54LuAmrgic3km BwVZ+2SDbglXXYZfqrezBaNxFaxLd4JH2k4gW7dSU+a2kMIMZdxxj3BEramV3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762207246; a=rsa-sha256; cv=none; b=nqxzPO8poaF16p6yqdRBXw5Pg51G/uf5wdwI9VVHM+hPrQC1LKFLo1Spqg+cvY5uWGxGk8 7pFjEUiRwagu+PadR/ML1Nd29xnaQUt3nLVmHjlNnyMwJyr9OfleG+8sUfAZ1I9jbgnuK5 1ez5aQka4OwDqLLiRlVhxJilHI21vkpkXvJyVEFo2dzccq+h8T+JuG8KWaRfroZF88tLa4 3CzY15VGs6VoRKkB10a2qwsNEA2mHkaEjQn0ZBp665SVevm/+BrBCnoYV7maPK+KKvBBtY A1I6lqELj6GbjzBuXjhJq0Yh8Nm808uYf/mEonXKYgiaDKnfM62c4Kh5gKJUGQ== 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 4d0lrt1TH7zDT1; Mon, 03 Nov 2025 22:00:46 +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 5A3M0kQL029761; Mon, 3 Nov 2025 22:00:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A3M0ktm029758; Mon, 3 Nov 2025 22:00:46 GMT (envelope-from git) Date: Mon, 3 Nov 2025 22:00:46 GMT Message-Id: <202511032200.5A3M0ktm029758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c63166a2aff4 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: c63166a2aff488314be4c2a75493ed30597a91d4 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c63166a2aff488314be4c2a75493ed30597a91d4 commit c63166a2aff488314be4c2a75493ed30597a91d4 Author: Ed Maste AuthorDate: 2025-10-31 15:53:42 +0000 Commit: Ed Maste CommitDate: 2025-11-03 20:42:50 +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 (cherry picked from commit e4f2a350955406ffd58dd3f0bb7610df0f36d647) (cherry picked from commit 1471af5110fc3bb6b1f1548e056f1717fb844ffd) --- share/mk/bsd.prog.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index fa15370a82c6..1c32a442aac9 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 @@ -65,16 +67,20 @@ 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 InitAll (zeros) requested but not supported by compiler .endif +.endif .elif ${MK_INIT_ALL_PATTERN} == "yes" .if ${COMPILER_FEATURES:Minit-all} CFLAGS+= -ftrivial-auto-var-init=pattern CXXFLAGS+= -ftrivial-auto-var-init=pattern .else +.if !defined(_NO_INCLUDE_COMPILERMK) .warning InitAll (pattern) requested but not supported by compiler .endif .endif +.endif # bsd.sanitizer.mk is not installed, so don't require it (e.g. for ports). .sinclude "bsd.sanitizer.mk"