From nobody Thu Sep 28 21:02:43 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 4RxQsv6jVlz4vbfh; Thu, 28 Sep 2023 21:02:43 +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 4RxQsv68L2z3DJh; Thu, 28 Sep 2023 21:02:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695934963; 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=Cpc2pRAfVIVTwTED0Hd41iS6/6endcle7IKMOHmnt8k=; b=XXQpGUpJ+ISwFqatWdPSfTXZG2vtxpodTt2+YkyRveNNJf2E2uc24qOzgGczG3ekTDMRv7 SvktIWmYYILaEN8rGWxYO0Q1KZT0kWF53mkRH2RKSPMTz7Yc0g7D2ergRyM12nxRlWTV2J 9qmXkNfJ4SDVroGQ62ErIi5HwykTyALgps/QS3SB+IGIeojV8BNKclAI4UZIUrvwXp7jgR fQ9eCn5MqED5NOdWFydPTT9UotaHcMweJzFrIz44pk2oNlQckaJk26vKOqgulow4PZA7rV tSVpYOBeSRi6qaFOu3xNmWcftpwkdTFEeWkvg+0uMYSMEokh6f0IlTr+s1OaiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695934963; a=rsa-sha256; cv=none; b=UAFl5KC1NppWTu6c5YXO9KLuPIv6CKFHrYut6SEz2Yd5ranUxMFsSCg0bYg6REKroWxp2c 59GwA5k5YmBdinkFMzTV7c3ZHgs021azAyoVSp57bt3nkmeaj3MmzbsFxmMgRBjQtDpIkG NUv4QfXKNMpRIYp4XVKv7CN3ZEmAmcs3e6upEvw5GjWcsW2sc0/nLBgFd6C84UKUqgL35d nQr8EZwd8KxO3JvBOIBKKTIaM3RE+ORF0Y6I0q4dwxudJDmtUeEloAswhCGnTiDGxO65nL 7tnnLDz3F5Z3XhyJdgXprgu8+hLMDLZzV/ddnWAFu5xU9FTBCUo91zOHT7+Yxg== 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=1695934963; 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=Cpc2pRAfVIVTwTED0Hd41iS6/6endcle7IKMOHmnt8k=; b=APRcp3wWR/yfElpfwZM3wAGeGQWehTHr3kiu2qAIM1+S0D8TqZU7fygFWgZjiT3gnAfmYF NyrFttY7Rg3v4EYrEbOJh95Mi7HrQIRoymaNzUuG9mJhOe+lBnRb1MIH4xyPloKhILUPiN TPmSeaOI2yxBQ+LIEjM8i00z4y5CJJQYutN1r5iHsFnIt6SgLYPX2b5IBLU0x7jqMbLIfM 6Z4MFc9xwLw8Fpm3wPXdSfhVIZ+d187fqvcxogA7qvcFeDa+z0a4wpvQphstXZe8OpfoPf sOmO+x2q1MeviwFKxANzyZzTDHlvL8ALXaPsLa3FV4mYfxgfJyMTU4AjJxLUxg== 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 4RxQsv5947zd4s; Thu, 28 Sep 2023 21:02:43 +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 38SL2hO4038940; Thu, 28 Sep 2023 21:02:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38SL2hqZ038937; Thu, 28 Sep 2023 21:02:43 GMT (envelope-from git) Date: Thu, 28 Sep 2023 21:02:43 GMT Message-Id: <202309282102.38SL2hqZ038937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: b45ab4b000b4 - main - Move the adding of CFLAGS_LAST to bsd.sys.mk 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b45ab4b000b46d301a0d95b856590067e3d67eb5 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b45ab4b000b46d301a0d95b856590067e3d67eb5 commit b45ab4b000b46d301a0d95b856590067e3d67eb5 Author: Simon J. Gerraty AuthorDate: 2023-09-28 21:01:56 +0000 Commit: Simon J. Gerraty CommitDate: 2023-09-28 21:01:56 +0000 Move the adding of CFLAGS_LAST to bsd.sys.mk The point of CFLAGS_LAST is to be the last thing in CFLAGS so add it last. For DIRDEPS_BUILD this can best be done via local.dirdeps-build.mk which is guaranteed to be the last makefile read, but that does nothing for non-DIRDEPS_BUILD bsd.sys.mk is close enough to the end. Reviewed by: obrien Differential Revision: https://reviews.freebsd.org/D42001 --- share/mk/bsd.sys.mk | 5 +++++ share/mk/local.autodep.mk | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 2b1a3e103b89..4cbe01404876 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -501,3 +501,8 @@ ${_tgt}: ${META_DEPS} .endif .endfor .endif + +# we are generally the last makefile read +CFLAGS+= ${CFLAGS_LAST} +CXXFLAGS+= ${CXXFLAGS_LAST} +LDFLAGS+= ${LDFLAGS_LAST} diff --git a/share/mk/local.autodep.mk b/share/mk/local.autodep.mk index d3772aa2b819..bc5bfd3e75db 100644 --- a/share/mk/local.autodep.mk +++ b/share/mk/local.autodep.mk @@ -11,10 +11,6 @@ NOSSPPICO?= .nossppico PIEO?= .pieo OBJ_EXTENSIONS+= ${NOSSPPICO} ${PIEO} -CFLAGS+= ${CFLAGS_LAST} -CXXFLAGS+= ${CXXFLAGS_LAST} -LDFLAGS+= ${LDFLAGS_LAST} - CLEANFILES+= .depend # handy for debugging