Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/i915drm Fix build with clang.



details:   https://anonhg.NetBSD.org/src/rev/a16740c31ba6
branches:  trunk
changeset: 333699:a16740c31ba6
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Nov 14 14:32:49 2014 +0000

description:
Fix build with clang.

diffstat:

 sys/external/bsd/drm2/i915drm/files.i915drmkms |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r 0361c97736fe -r a16740c31ba6 sys/external/bsd/drm2/i915drm/files.i915drmkms
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms    Fri Nov 14 14:29:16 2014 +0000
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms    Fri Nov 14 14:32:49 2014 +0000
@@ -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 @@
 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"
 



Home | Main Index | Thread Index | Old Index