diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2017-06-20 16:45:48 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2017-06-20 16:45:48 +0000 |
| commit | d6609e6a12ae53ebf09dc38fd09b7e4537df57aa (patch) | |
| tree | ad8a85038b7d82cddd9f6510eabbc72974ac25e9 /usr.sbin/fstyp | |
| parent | cec9c3b13bef10d823f15e7bee8807b8064d263e (diff) | |
| download | src-test2-d6609e6a12ae53ebf09dc38fd09b7e4537df57aa.tar.gz src-test2-d6609e6a12ae53ebf09dc38fd09b7e4537df57aa.zip | |
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
Notes
Notes:
svn path=/head/; revision=320152
Diffstat (limited to 'usr.sbin/fstyp')
| -rw-r--r-- | usr.sbin/fstyp/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile index d9f5470261c3..a86cb536b620 100644 --- a/usr.sbin/fstyp/Makefile +++ b/usr.sbin/fstyp/Makefile @@ -19,8 +19,6 @@ WARNS?= 2 SUBDIR+= tests .endif -CFLAGS+=-I${SRCTOP}/sys - .if ${MK_ZFS} != "no" IGNORE_PRAGMA= YES @@ -36,6 +34,8 @@ 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 .if ${MK_ZFS} != "no" |