git: 7dfb8f15e269 - stable/12 - bin/df: fix build with MOUNT_CHAR_DEVS defined
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 18 Apr 2022 12:00:59 UTC
The branch stable/12 has been updated by se:
URL: https://cgit.FreeBSD.org/src/commit/?id=7dfb8f15e2692a16c4e1bba4b8cb5c5d85f5cfe1
commit 7dfb8f15e2692a16c4e1bba4b8cb5c5d85f5cfe1
Author: Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2022-04-18 11:56:38 +0000
Commit: Stefan Eßer <se@FreeBSD.org>
CommitDate: 2022-04-18 12:00:33 +0000
bin/df: fix build with MOUNT_CHAR_DEVS defined
When resolving conflicts due to the unmergewd commit that removed the
code previously made conditional on MOUNT_CHAR_DEVS, I failed to see
that MOUNT needed to be defined in the Makefile and that the include
of mntopts.h was still required for that case.
Fix the build by adding back the missing definitions to the Makefile.
---
bin/df/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bin/df/Makefile b/bin/df/Makefile
index 52eab0abfc1a..bf1c72b884ac 100644
--- a/bin/df/Makefile
+++ b/bin/df/Makefile
@@ -2,10 +2,12 @@
# $FreeBSD$
PACKAGE=runtime
+MOUNT= ${.CURDIR}/../../sbin/mount
PROG= df
SRCS= df.c
+CFLAGS+= -I${MOUNT}
CFLAGS+= -DMOUNT_CHAR_DEVS
LIBADD= xo util