Author: mav
Date: Thu Jul 27 10:52:36 2017
New Revision: 321615
URL: https://svnweb.freebsd.org/changeset/base/321615
Log:
MFC r320152 (by avg): fstyp: move sys/ include path after zfs include paths
The reason is that FreeBSD refcount.h shadows ZFS refcount.h and that
will lead to a build error after a planned import of the ARC buf data
scatter-ization.
It's possible that some day we will have an opposite problem where
a ZFS header would shadow an essential FreeBSD header.
So, we need to think about a better long term solution.
Modified:
stable/11/usr.sbin/fstyp/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.sbin/fstyp/Makefile
==============================================================================
--- stable/11/usr.sbin/fstyp/Makefile Thu Jul 27 10:30:55 2017
(r321614)
+++ stable/11/usr.sbin/fstyp/Makefile Thu Jul 27 10:52:36 2017
(r321615)
@@ -18,8 +18,6 @@ WARNS?= 2
SUBDIR+= tests
.endif
-CFLAGS+=-I${SRCTOP}/sys
-
.if ${MK_ZFS} != "no"
IGNORE_PRAGMA= YES
@@ -34,6 +32,8 @@ CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/
CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys
CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
.endif
+
+CFLAGS+=-I${SRCTOP}/sys
LIBADD= geom md
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
