git: 2b05d46dc32f - stable/14 - Fix incorrect -I option in sys/conf/Makefile.arm

From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Sun, 04 Aug 2024 10:23:21 UTC
The branch stable/14 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=2b05d46dc32f89f915ed3f75b988925b43ebcd7a

commit 2b05d46dc32f89f915ed3f75b988925b43ebcd7a
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-07-31 19:23:41 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-08-04 10:21:10 +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
    
    (cherry picked from commit 8ce3e489a5eec1b41bc5e08f43c5e95aa8115b93)
---
 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 af6ce7136636..5195191e0156 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -29,7 +29,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}\"