From nobody Sat Dec 25 11:55:44 2021 X-Original-To: dev-commits-src-branches@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 55C6118F3281; Sat, 25 Dec 2021 11:55: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 4JLj76568jz4lCh; Sat, 25 Dec 2021 11:55:46 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D8A1016E87; Sat, 25 Dec 2021 11:55:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BPBtiwm006716; Sat, 25 Dec 2021 11:55:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BPBtiYw006715; Sat, 25 Dec 2021 11:55:44 GMT (envelope-from git) Date: Sat, 25 Dec 2021 11:55:44 GMT Message-Id: <202112251155.1BPBtiYw006715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 14134e64f362 - stable/12 - Follow-up r349065: Fix .TARGET flag ambiguity with PROGS which broke MK_TESTS. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 14134e64f3620c72c105928f31d05f5e81f272e7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640433347; 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=N7qQzgHDKZy+SifHRg7JplE/sDyhHBa+T2SiHadZqHo=; b=Gi0e3r4GNC4WYGoKZoR/gQvVi5f/ASavdmbsnBHyxZ+FRu+DHyuTE+/QsSuP0J4ULh760U IWMybWlcjq1ltajwdOfCqtFuvy+jElD/8DlSrZSrrwT1eOWEdpfxCOPNLOOAOVoyjRmX1t 3C8cnQXDYAnBBSNB5vlbQ5kDZc8HaD/7lo6sjgz3kUcBPehUT0KZ8CO04bOgm/cEdppxgK Db1nGIo6MT1LWXfKWEe7LDaIz8zR9TmA+BLwf+dCfIHvzkcv2bmiYoKTDPJAs4yx9hDSd4 FftqEF+7x65dARDUtEKvgSAIjG0oALQeKLOJfwqoHAgNTnXe9PjRewnqwbcPDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640433347; a=rsa-sha256; cv=none; b=tCcOb54I5q+b9CHBVU07tnPGMpqvFcNavbf5DDtL44cDvpWr3sB4l0qgHX6DVLoxVFoLLH WLeo1xXQlcTsH5J/P0cYFqiFp9pWzXo9KLSjoiLf9VAVfF8ILVokqj+2S2n61da7mupsPQ YH+LE9pDD83aSEeGGgP2f/JjYpWvKUM3JOTt+EzjWK5F2FIQXcrLd+VWRLtqvBMBFOyUPR G6g8VRSsnOCI8Iv39h7Ym+gkgSyHPGkYUuISBGQGjXzi0tQgVZlJuI2T/OSWXrjfQqUyW3 zfEACDhcHU+KRBwi233CTZFK3CG2ytDo/f+LPD5zzq6ZTk8a/bdWJK/EyjlYig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=14134e64f3620c72c105928f31d05f5e81f272e7 commit 14134e64f3620c72c105928f31d05f5e81f272e7 Author: Bryan Drewery AuthorDate: 2019-06-19 19:19:37 +0000 Commit: Dimitry Andric CommitDate: 2021-12-25 11:51:18 +0000 Follow-up r349065: Fix .TARGET flag ambiguity with PROGS which broke MK_TESTS. X-MFC-With: r349065 Sponsored by: DellEMC (cherry picked from commit 8e0c373903c0ea70ea22e650a24a92d2a0744bd8) --- share/mk/bsd.sys.mk | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 5e9b8ed51b5a..375df956b4fd 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -253,7 +253,6 @@ DEBUG_FILES_CFLAGS?= -g .if ${MK_WARNS} != "no" CFLAGS+= ${CWARNFLAGS:M*} ${CWARNFLAGS.${COMPILER_TYPE}} CFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} -CFLAGS+= ${CWARNFLAGS.${.TARGET:T}} CXXFLAGS+= ${CXXWARNFLAGS:M*} ${CXXWARNFLAGS.${COMPILER_TYPE}} CXXFLAGS+= ${CXXWARNFLAGS.${.IMPSRC:T}} .endif @@ -266,14 +265,23 @@ AFLAGS+= ${AFLAGS.${.TARGET:T}} ACFLAGS+= ${ACFLAGS.${.IMPSRC:T}} ACFLAGS+= ${ACFLAGS.${.TARGET:T}} CFLAGS+= ${CFLAGS.${.IMPSRC:T}} -CFLAGS+= ${CFLAGS.${.TARGET:T}} CXXFLAGS+= ${CXXFLAGS.${.IMPSRC:T}} -CXXFLAGS+= ${CXXFLAGS.${.TARGET:T}} LDFLAGS+= ${LDFLAGS.${LINKER_TYPE}} + +# Only allow .TARGET when not using PROGS as it has the same syntax +# per PROG which is ambiguous with this syntax. This is only needed +# for PROG_VARS vars. +.if !defined(_RECURSING_PROGS) +.if ${MK_WARNS} != "no" +CFLAGS+= ${CWARNFLAGS.${.TARGET:T}} +.endif +CFLAGS+= ${CFLAGS.${.TARGET:T}} +CXXFLAGS+= ${CXXFLAGS.${.TARGET:T}} LDFLAGS+= ${LDFLAGS.${.TARGET:T}} LDADD+= ${LDADD.${.TARGET:T}} LIBADD+= ${LIBADD.${.TARGET:T}} +.endif .if defined(SRCTOP) # Prevent rebuilding during install to support read-only objdirs.