From nobody Tue Dec 9 16:00:33 2025 X-Original-To: dev-commits-src-main@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 4dQk8f2SL7z6Kq5R for ; Tue, 09 Dec 2025 16:00:34 +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 4dQk8f0YdZz46kG for ; Tue, 09 Dec 2025 16:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765296034; 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=K9oh3NVwo2pNdL4N0SHCJHJchQ9vanT56W3wmY6ZGOA=; b=lwyhOq5b0QD0nRXW3Xhsv6g9JBfJ8JNxVd3yOH8Lag7aXGBUirNawMxjOfj1co0pG5xMiz 239lCsGzkbuv2LiMF33mcc0icQuzBsnLVIhmErX5zJHkBW+rS9yiHP6Y3kDlON5Iw7qZdN fLCbWVp0yU4JHsVTA1FE5h4YbFNawE2fWLYQ4JTxW8xgsZ2Jb7IAl6EU1wcfInFiRom9RN nyPmanbDB1eGHQGMfj4P45FWsYPbTM+WEfXoBvIqYotTZqkVdxaRBKdeyNEcD4W/UDfutq i8sEJxb+os2WezTQSzxz2GReSWDI6r/mNYuhsjp6rOzTdc/SNdvOVRP3zC7O2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765296034; 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=K9oh3NVwo2pNdL4N0SHCJHJchQ9vanT56W3wmY6ZGOA=; b=szhXJFrUdsdim76SE1GDQx0BqJ0SyAgsRrJmP80sDRJMt1RMHJKNrRM+pbOzDUnMdQ4dHj IkMBAh2rPrf1XRBYJEpkATx5P6j6/9x0ahlylHZliNq5AdHTIvt32fcOAeNdcv0fNS+hL6 5V28gHBEhIdO9qXdxIdyAviVYoWS2Ck/7wd7gdyWPdUqbCOo2wsyUNKy9F9EAhWljgkVkr Vuda1blpp4hN9fzfVjlAj2cgdGd93R+qzQ6Jk5p6mBW7vRFEtlHrMaLosVCIkVHH9VanVB lbIPUUJMb613sUAl95WwtJeVaKq4PCboar4VdgES9qeYqbo+StPWQh6MkciZRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765296034; a=rsa-sha256; cv=none; b=ijZ1xI+9Ova+SKDhejZmgDVHFhowju++DHUFnZXTAKjpRyoMFdqkZy3bcdwpcQEFvIh8cP kh12pei1DW4JiC9JcU6GwU/qhlAy7NPryR8ctQt3qULeIZWACMBnu3G5fPML0Pmr5umQkW Vh4tFmKYgNMem6l7O5SmK+1NjS7IgvPcd/WiLbVrUH95TqzXzXqVyyNXCax6GXy3ebwCCm iKKHq+xF8VdshSvm0TQsLddHZcIzp7+UtVu5iZwlnfS4PjX0Gh8wwrx7TjEwEQlNqoqDm/ 2vHLsSMnpA7nJ1YmM84pW+nN2ldZVwVF89o9HM/i8qTXDnLhQMAQP4NyCVhfkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dQk8d6tpZz15Gc for ; Tue, 09 Dec 2025 16:00:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 350d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Dec 2025 16:00:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 701e4b36b451 - main - zfs: Reuse ZINCDIR variable from kmod.mk List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 701e4b36b4510c8cf26155ec3ab5aca9b7ba9406 Auto-Submitted: auto-generated Date: Tue, 09 Dec 2025 16:00:33 +0000 Message-Id: <693847a1.350d7.13f68bc8@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=701e4b36b4510c8cf26155ec3ab5aca9b7ba9406 commit 701e4b36b4510c8cf26155ec3ab5aca9b7ba9406 Author: John Baldwin AuthorDate: 2025-12-09 16:00:20 +0000 Commit: John Baldwin CommitDate: 2025-12-09 16:00:20 +0000 zfs: Reuse ZINCDIR variable from kmod.mk Reviewed by: brooks, imp Differential Revision: https://reviews.freebsd.org/D54147 --- sys/modules/zfs/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 7a4d0bb51376..2751bb465258 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -1,5 +1,4 @@ SRCDIR=${SRCTOP}/sys/contrib/openzfs/module -INCDIR=${SRCTOP}/sys/contrib/openzfs/include KMOD= zfs @@ -27,11 +26,11 @@ KMOD= zfs ${SRCDIR}/zstd/lib/compress \ ${SRCDIR}/zstd/lib/decompress -CFLAGS+= -I${INCDIR} +CFLAGS+= -I${ZINCDIR} CFLAGS+= -I${SRCDIR}/icp/include -CFLAGS+= -I${INCDIR}/os/freebsd -CFLAGS+= -I${INCDIR}/os/freebsd/spl -CFLAGS+= -I${INCDIR}/os/freebsd/zfs +CFLAGS+= -I${ZINCDIR}/os/freebsd +CFLAGS+= -I${ZINCDIR}/os/freebsd/spl +CFLAGS+= -I${ZINCDIR}/os/freebsd/zfs CFLAGS+= -I${SRCDIR}/zstd/include CFLAGS+= -I${.CURDIR} @@ -388,7 +387,7 @@ SRCS+= zfs_zstd.c \ .include CFLAGS+= -include ${SRCTOP}/sys/cddl/compat/opensolaris/sys/debug_compat.h -CFLAGS+= -include ${INCDIR}/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -include ${ZINCDIR}/os/freebsd/spl/sys/ccompile.h CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/static_ccompile.h CFLAGS.sysctl_os.c= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h