Module Name: src
Committed By: riastradh
Date: Wed Jul 20 10:01:01 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/drm: files.drmkms
Log Message:
drm: Keep drm include flags in CPPFLAGS.drmkms after all.
Failures from this are much more obvious to debug than files with
missing #ifdefs, which sometimes lead to build failures but could
also just lead to silent miscompilation.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/external/bsd/drm2/drm/files.drmkms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.78 src/sys/external/bsd/drm2/drm/files.drmkms:1.79
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.78 Wed Jul 20 01:38:24 2022
+++ src/sys/external/bsd/drm2/drm/files.drmkms Wed Jul 20 10:01:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms,v 1.78 2022/07/20 01:38:24 riastradh Exp $
+# $NetBSD: files.drmkms,v 1.79 2022/07/20 10:01:01 riastradh Exp $
version 20180827
@@ -17,15 +17,15 @@ define drmkms: drmkms_linux, drmkms_i2c,
makeoptions drmkms "COPTS.drmkms"+="-fwrapv"
# Overrides first.
-makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/include"
-makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/include/drm"
+makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/include"
+makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/include/drm"
-makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/common/include"
+makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/common/include"
# Then upstream.
-makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/include"
-makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/drm"
-makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/uapi"
+makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include"
+makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include/drm"
+makeoptions drmkms "CPPFLAGS.drmkms"+="-I$S/external/bsd/drm2/dist/include/uapi"
makeoptions drmkms "CPPFLAGS.drmkms"+="-D__KERNEL__"
