Module Name: src
Committed By: joerg
Date: Fri Nov 14 14:32:49 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Log Message:
Fix build with clang.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
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/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.8 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.9
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.8 Wed Nov 5 23:46:09 2014
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Fri Nov 14 14:32:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.8 2014/11/05 23:46:09 nonaka Exp $
+# $NetBSD: files.i915drmkms,v 1.9 2014/11/14 14:32:49 joerg Exp $
define intelfbbus { }
device i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810
@@ -10,8 +10,9 @@ attach intelfb at intelfbbus
makeoptions i915drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/i915"
makeoptions i915drmkms CPPFLAGS+="-I$S/external/bsd/drm2/i915drm"
-makeoptions i915drmkms "CWARNFLAGS.i915_drv.c"+="-Wno-override-init"
-makeoptions i915drmkms "CWARNFLAGS.intel_display.c"+="-Wno-shadow"
+makeoptions i915drmkms "CWARNFLAGS.i915_drv.c"+="${${ACTIVE_CC} == gcc:? -Wno-override-init :}"
+makeoptions i915drmkms "CWARNFLAGS.i915_drv.c"+="${${ACTIVE_CC} == clang:? -Wno-initializer-overrides :}"
+makeoptions i915drmkms "CWARNFLAGS.intel_display.c"+="-Wno-shadow -Wno-conversion"
makeoptions i915drmkms "CWARNFLAGS.intel_panel.c"+="-Wno-shadow"
makeoptions i915drmkms "CWARNFLAGS.intel_pm.c"+="-Wno-shadow"
