diff options
| author | Michael Paepcke <git@paepcke.de> | 2023-02-24 19:27:40 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2023-02-25 17:14:07 +0000 |
| commit | 4d59545d0cacb5881e2515eecce15e8478f07276 (patch) | |
| tree | 98423ca1c823ac071ffa0e527ec6f11ff73684a0 /stand | |
| parent | 2f201df1f875349417cafe30b8322291641aadb0 (diff) | |
Diffstat (limited to 'stand')
| -rw-r--r-- | stand/userboot/userboot/Makefile | 4 | ||||
| -rw-r--r-- | stand/userboot/userboot/main.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile index 43011b9577c9..986bfdccfdd6 100644 --- a/stand/userboot/userboot/Makefile +++ b/stand/userboot/userboot/Makefile @@ -36,9 +36,13 @@ SRCS+= gfx_fb_stub.c CFLAGS+= -Wall CFLAGS+= -I${BOOTSRC}/userboot + +.if ${MK_LOADER_ZFS} != "no" CFLAGS.main.c+= -I${BOOTSRC}/libsa/zfs CFLAGS.main.c+= -I${SYSDIR}/contrib/openzfs/include CFLAGS.main.c+= -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs +.endif + CWARNFLAGS.main.c += -Wno-implicit-function-declaration CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken diff --git a/stand/userboot/userboot/main.c b/stand/userboot/userboot/main.c index 40911f35020a..b134d86de9bd 100644 --- a/stand/userboot/userboot/main.c +++ b/stand/userboot/userboot/main.c @@ -32,13 +32,13 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <setjmp.h> #include <sys/disk.h> -#include <sys/zfs_bootenv.h> #include "bootstrap.h" #include "disk.h" #include "libuserboot.h" #if defined(USERBOOT_ZFS_SUPPORT) +#include <sys/zfs_bootenv.h> #include "libzfs.h" static void userboot_zfs_probe(void); |