Date: Wed, 16 Jun 2021 00:45:36 GMT From: Martin Matuska <mm@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: d940dcb757cd - stable/13 - zfs: unbreak stable/13 clang build on non-x86 archs after b0c251b0d Message-ID: <202106160045.15G0jaSX052637@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=d940dcb757cd2214a218fe3445eef5d24581b556 commit d940dcb757cd2214a218fe3445eef5d24581b556 Author: Martin Matuska <mm@FreeBSD.org> AuthorDate: 2021-06-16 00:38:42 +0000 Commit: Martin Matuska <mm@FreeBSD.org> CommitDate: 2021-06-16 00:44:48 +0000 zfs: unbreak stable/13 clang build on non-x86 archs after b0c251b0d (direct commit) --- cddl/lib/libspl/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile index 8088ef497d46..c657dd9b2290 100644 --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ +.include <bsd.init.mk> +.include <bsd.compiler.mk> + .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl/os/freebsd .PATH: ${SRCTOP}/sys/contrib/openzfs/include - LIB= spl LIBADD= PACKAGE= runtime @@ -53,6 +55,9 @@ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h +.if ${COMPILER_TYPE} == "clang" +CFLAGS.atomic.c+= -Wno-error=atomic-alignment +.endif CFLAGS.atomic.S+= -DLOCORE .include <bsd.lib.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106160045.15G0jaSX052637>