[src/trunk]: src/sys/external/bsd/drm2/i915drm Move CPPFLAGS to top, CWARNFLA...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/71562be0295c
branches:  trunk
changeset: 835281:71562be0295c
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 13:54:04 2018 +0000

description:
Move CPPFLAGS to top, CWARNFLAGS below.

diffstat:

 sys/external/bsd/drm2/i915drm/files.i915drmkms |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (30 lines):

diff -r caec88af2aed -r 71562be0295c sys/external/bsd/drm2/i915drm/files.i915drmkms
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms    Mon Aug 27 13:53:52 2018 +0000
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms    Mon Aug 27 13:54:04 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i915drmkms,v 1.28 2018/08/27 13:53:52 riastradh Exp $
+#      $NetBSD: files.i915drmkms,v 1.29 2018/08/27 13:54:04 riastradh Exp $
 
 define intelfbbus      { }
 device i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810
@@ -10,16 +10,15 @@
 makeoptions    i915drmkms      CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/i915"
 makeoptions    i915drmkms      CPPFLAGS+="-I$S/external/bsd/drm2/i915drm"
 
+makeoptions    i915drmkms      CPPFLAGS+="-DCONFIG_DRM_I915_FBDEV=1"
+makeoptions    i915drmkms      CPPFLAGS+="-DCONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=0"
+makeoptions    i915drmkms      CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1"
+
 makeoptions    i915drmkms      "CWARNFLAGS.i915drmkms"+="-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 :}"
 
-# XXX x86 kludge.
-makeoptions    i915drmkms      CPPFLAGS+="-DCONFIG_DRM_I915_FBDEV=1"
-makeoptions    i915drmkms      CPPFLAGS+="-DCONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=0"
-makeoptions    i915drmkms      CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1"
-
 file   external/bsd/drm2/i915drm/i915_module.c         i915drmkms
 file   external/bsd/drm2/i915drm/i915_pci.c            i915drmkms
 file   external/bsd/drm2/i915drm/intel_gtt.c           i915drmkms