The branch main has been updated by jhibbits:
URL:
https://cgit.FreeBSD.org/src/commit/?id=de1ac9462f31956a98e9953009f02a0e39eed283
commit de1ac9462f31956a98e9953009f02a0e39eed283
Author: Justin Hibbits <jhibb...@freebsd.org>
AuthorDate: 2024-05-09 19:46:09 +0000
Commit: Justin Hibbits <jhibb...@freebsd.org>
CommitDate: 2024-05-10 18:35:50 +0000
conf: Generate fdt_static_dtb.h in OBJDIR
Though the kernel build expects ${.OBJDIR} to be equal to ${.CURDIR}
that may not always be the case. Correctly generate fdt_static_dtb.h in
${.OBJDIR}, which is conceptually more correct anyway.
Obtained from: Juniper Networks, Inc.
---
sys/conf/files | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/conf/files b/sys/conf/files
index 7fd79bb0345d..56c92f51947f 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -19,7 +19,7 @@ bhnd_nvram_map_data.h optional bhnd
\
no-obj no-implicit-rule before-depend \
clean "bhnd_nvram_map_data.h"
fdt_static_dtb.h optional fdt fdt_dtb_static \
- compile-with "sh -c 'MACHINE=${MACHINE} $S/tools/fdt/make_dtbh.sh
${FDT_DTS_FILE} ${.CURDIR}'" \
+ compile-with "sh -c 'MACHINE=${MACHINE} $S/tools/fdt/make_dtbh.sh
${FDT_DTS_FILE} ${.OBJDIR}'" \
dependency "${FDT_DTS_FILE:T:R}.dtb" \
no-obj no-implicit-rule before-depend \
clean "fdt_static_dtb.h"
