The branch main has been updated by dim:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=8ce3e489a5eec1b41bc5e08f43c5e95aa8115b93

commit 8ce3e489a5eec1b41bc5e08f43c5e95aa8115b93
Author:     Dimitry Andric <[email protected]>
AuthorDate: 2024-07-31 19:23:41 +0000
Commit:     Dimitry Andric <[email protected]>
CommitDate: 2024-07-31 19:31:21 +0000

    Fix incorrect -I option in sys/conf/Makefile.arm
    
    In commit 8e53cd7099436 the intent was to add sys/dts/include to the
    compiler include path, but this was spelled incorrectly, leading to an
    error with clang 19:
    
      cc: error: no such include directory: '$/dts/include' 
[-Werror,-Wmissing-include-dirs]
    
    Use the spelling -I$S/dts/include instead.
    
    MFC after:      3 days
---
 sys/conf/Makefile.arm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index 36c412cfbb12..5416aff76666 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -27,7 +27,7 @@ S=    ../../..
 .endif
 .include "$S/conf/kern.pre.mk"
 
-INCLUDES+= -I$S/contrib/libfdt -I$S/contrib/device-tree/include 
-I$$/dts/include
+INCLUDES+= -I$S/contrib/libfdt -I$S/contrib/device-tree/include 
-I$S/dts/include
 
 LINUX_DTS_VERSION!=    awk '/freebsd,dts-version/ { sub(/;$$/,"", $$NF); print 
$$NF }' $S/dts/freebsd-compatible.dts
 CFLAGS += -DLINUX_DTS_VERSION=\"${LINUX_DTS_VERSION}\"

Reply via email to