From d1fb0e1dc8ec983456f251d26d7d3508368a2b16 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Fri, 22 Jul 2022 09:53:57 -0600 Subject: [PATCH] stand libsa: Restore include path to LDRSRC for disk.h for filesystems. In theory they shouldn't need anything outside of libsa, but disk.h and bootstrap.h are currently required. Future work wil address this issue. This fixes the build with MK_LOADER_ZFS=no. ZFS's Makefile.inc adds these flags globally to CFLAGS when it should not. This masked the problem because the tools/boot/universe.sh didn't build MK_LOADER_ZFS=no as part of its regressions. Future work will also fix this. Obtained from: CheriBSD Fixes: 84bf2bbbecc3 stand: constrain zlib/gzip CFLAGS better Sponsored by: DARPA Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D35860 --- stand/libsa/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index dc35fe007506..6351027c99cd 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -170,6 +170,9 @@ SRCS+= time.c .PATH: ${SRCTOP}/sys/ufs/ffs SRCS+=ffs_subr.c ffs_tables.c +CFLAGS.dosfs.c+= -I${LDRSRC} +CFLAGS.tftp.c+= -I${LDRSRC} +CFLAGS.ufs.c+= -I${LDRSRC} CFLAGS.gzipfs.c+= ${ZLIB_CFLAGS} CFLAGS.pkgfs.c+= ${ZLIB_CFLAGS} CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2 -DBZ_NO_STDIO -DBZ_NO_COMPRESS