From owner-dev-commits-src-main@freebsd.org Tue Aug 3 09:38:52 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3CFF1634644; Tue, 3 Aug 2021 09:38:52 +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 4Gf8vc1DWfz3MtX; Tue, 3 Aug 2021 09:38:52 +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 12941110E2; Tue, 3 Aug 2021 09:38:52 +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 1739cp2o055483; Tue, 3 Aug 2021 09:38:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1739cprS055482; Tue, 3 Aug 2021 09:38:51 GMT (envelope-from git) Date: Tue, 3 Aug 2021 09:38:51 GMT Message-Id: <202108030938.1739cprS055482@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: 428a32edba4c - main - Use .sinclude for bsd.sanitizer.mk MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 428a32edba4c3bf3cfc0e4cf240c1b29397ecdbb Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Aug 2021 09:38:52 -0000 The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=428a32edba4c3bf3cfc0e4cf240c1b29397ecdbb commit 428a32edba4c3bf3cfc0e4cf240c1b29397ecdbb Author: Alex Richardson AuthorDate: 2021-08-03 09:37:28 +0000 Commit: Alex Richardson CommitDate: 2021-08-03 09:38:20 +0000 Use .sinclude for bsd.sanitizer.mk We don't install this file since MK_ASAN/MK_UBSAN is only supported for src builds. However, some ports also use bsd.lib.mk/bsd.prog.mk so we should not fail the build if it can't be included. Reported by: jkim Fixes: 7bc797e3f380 ("Add build system support for ASAN+UBSAN instrumentation") --- share/mk/bsd.lib.mk | 3 ++- share/mk/bsd.prog.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 5de74b6fa056..aaac0b68d984 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -108,7 +108,8 @@ CXXFLAGS+= -ftrivial-auto-var-init=pattern .endif .endif -.include "bsd.sanitizer.mk" +# bsd.sanitizer.mk is not installed, so don't require it (e.g. for ports). +.sinclude "bsd.sanitizer.mk" .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \ empty(DEBUG_FLAGS:M-gdwarf*) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 96d72daf2611..4f00be193874 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -81,7 +81,8 @@ CXXFLAGS+= -ftrivial-auto-var-init=pattern .endif .endif -.include "bsd.sanitizer.mk" +# bsd.sanitizer.mk is not installed, so don't require it (e.g. for ports). +.sinclude "bsd.sanitizer.mk" .if ${MACHINE_CPUARCH} == "riscv" && ${LINKER_FEATURES:Mriscv-relaxations} == "" CFLAGS += -mno-relax