Thu Nov 13 16:37:39 2014 UTC ()
Adjust flags to allow building with clang.


(joerg)
diff -r1.6 -r1.7 src/sys/modules/i915drmkms/Makefile
cvs diff -r1.6 -r1.7 src/sys/modules/i915drmkms/Makefile (expand / switch to unified diff)

--- src/sys/modules/i915drmkms/Makefile 2014/11/12 02:15:16 1.6
+++ src/sys/modules/i915drmkms/Makefile 2014/11/13 16:37:39 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.6 2014/11/12 02:15:16 christos Exp $ 1# $NetBSD: Makefile,v 1.7 2014/11/13 16:37:39 joerg Exp $
2 2
3.include "../Makefile.inc" 3.include "../Makefile.inc"
4.include "../drmkms/Makefile.inc" 4.include "../drmkms/Makefile.inc"
5 5
6CPPFLAGS+= -I${S}/external/bsd/drm2/dist/drm/i915 6CPPFLAGS+= -I${S}/external/bsd/drm2/dist/drm/i915
7CPPFLAGS+= -I${S}/external/bsd/drm2/i915drm 7CPPFLAGS+= -I${S}/external/bsd/drm2/i915drm
8 8
9.PATH: ${S}/external/bsd/drm2/i915drm 9.PATH: ${S}/external/bsd/drm2/i915drm
10.PATH: ${S}/external/bsd/drm2/dist/drm/i915 10.PATH: ${S}/external/bsd/drm2/dist/drm/i915
11 11
12KMOD= i915drmkms 12KMOD= i915drmkms
13IOCONF= i915drmkms.ioconf 13IOCONF= i915drmkms.ioconf
14MKLDSCRIPT=yes 14MKLDSCRIPT=yes
@@ -60,24 +60,26 @@ SRCS+= intel_panel.c @@ -60,24 +60,26 @@ SRCS+= intel_panel.c
60SRCS+= intel_pm.c 60SRCS+= intel_pm.c
61SRCS+= intel_ringbuffer.c 61SRCS+= intel_ringbuffer.c
62SRCS+= intel_sdvo.c 62SRCS+= intel_sdvo.c
63SRCS+= intel_sideband.c 63SRCS+= intel_sideband.c
64SRCS+= intel_sprite.c 64SRCS+= intel_sprite.c
65SRCS+= intel_tv.c 65SRCS+= intel_tv.c
66SRCS+= intel_uncore.c 66SRCS+= intel_uncore.c
67 67
68SRCS+= i915_module.c 68SRCS+= i915_module.c
69SRCS+= i915_pci.c 69SRCS+= i915_pci.c
70SRCS+= intel_gtt.c 70SRCS+= intel_gtt.c
71SRCS+= intelfb.c 71SRCS+= intelfb.c
72 72
73COPTS.i915_drv.c+= -Wno-override-init 73COPTS.i915_drv.c+= ${${ACTIVE_CC} == "gcc":? -Wno-override-init :}
74COPTS.intel_display.c+= -Wno-shadow 74COPTS.i915_drv.c+= ${${ACTIVE_CC} == "clang":? -Wno-initializer-overrides :}
 75
 76COPTS.intel_display.c+= -Wno-shadow -Wno-conversion
75COPTS.intel_panel.c+= -Wno-shadow 77COPTS.intel_panel.c+= -Wno-shadow
76COPTS.intel_pm.c+= -Wno-shadow 78COPTS.intel_pm.c+= -Wno-shadow
77 79
78CPPFLAGS+= -DCONFIG_DRM_I915_FBDEV 80CPPFLAGS+= -DCONFIG_DRM_I915_FBDEV
79 81
80CPPFLAGS+= -DNACPICA=1 82CPPFLAGS+= -DNACPICA=1
81CPPFLAGS+= -DNVGA=1 83CPPFLAGS+= -DNVGA=1
82 84
83.include <bsd.kmodule.mk> 85.include <bsd.kmodule.mk>