diff options
| author | mav <mav@FreeBSD.org> | 2017-07-27 10:52:36 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2017-07-27 10:52:36 +0000 |
| commit | 72b84624ed4df439cee93478f172d9e093452608 (patch) | |
| tree | 7703e4222c1ce4b0eb1aed2689d7e35ecc0630bd /usr.sbin | |
| parent | 000d8f20a15e6d2817888144147ea12d3adad197 (diff) | |
| download | FreeBSD-src-72b84624ed4df439cee93478f172d9e093452608.zip FreeBSD-src-72b84624ed4df439cee93478f172d9e093452608.tar.gz | |
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.
Diffstat (limited to 'usr.sbin')
| -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 e19e9dd..1415a50 100644 --- a/usr.sbin/fstyp/Makefile +++ b/usr.sbin/fstyp/Makefile @@ -18,8 +18,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/common/sys CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head .endif +CFLAGS+=-I${SRCTOP}/sys + LIBADD= geom md .if ${MK_ZFS} != "no" |
