Author: avg
Date: Tue Jun 20 16:45:48 2017
New Revision: 320152
URL: https://svnweb.freebsd.org/changeset/base/320152
Log:
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.
Discussed with: allanjude
MFC after: 17 days
Modified:
head/usr.sbin/fstyp/Makefile
Modified: head/usr.sbin/fstyp/Makefile
==============================================================================
--- head/usr.sbin/fstyp/Makefile Tue Jun 20 16:40:31 2017
(r320151)
+++ head/usr.sbin/fstyp/Makefile Tue Jun 20 16:45:48 2017
(r320152)
@@ -19,8 +19,6 @@ WARNS?= 2
SUBDIR+= tests
.endif
-CFLAGS+=-I${SRCTOP}/sys
-
.if ${MK_ZFS} != "no"
IGNORE_PRAGMA= YES
@@ -35,6 +33,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-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
