svn commit: r259618 - stable/9/sys/conf

[Warner Losh]

Author: imp
Date: Thu Dec 19 18:06:52 2013
New Revision: 259618
URL: http://svnweb.freebsd.org/changeset/base/259618

Log:
  Improve compatibility with earlier parts of the 9 branch by defaulting
  to MK_CLANG_IS_CC is no when it isn't otherwise defined. Also,
  bsd.compiler.mk wasn't present in 9.0, so don't require it. With these
  changes, you can compile a tip of 9.x kernel and modules old-school on
  a 9.0 system.
  
  # Direct commit since this isn't relevant to 10 or current.

Modified:
  stable/9/sys/conf/kern.mk
  stable/9/sys/conf/kern.pre.mk
  stable/9/sys/conf/kmod.mk

Modified: stable/9/sys/conf/kern.mk
==============================================================================
--- stable/9/sys/conf/kern.mk	Thu Dec 19 17:29:56 2013	(r259617)
+++ stable/9/sys/conf/kern.mk	Thu Dec 19 18:06:52 2013	(r259618)
@@ -8,6 +8,7 @@ CWARNFLAGS?=	-Wall -Wredundant-decls -Wn
 		-Wundef -Wno-pointer-sign -fformat-extensions \
 		-Wmissing-include-dirs -fdiagnostics-show-option \
 		${CWARNEXTRA}
+MK_CLANG_IS_CC ?= no
 #
 # The following flags are next up for working on:
 #	-Wextra

Modified: stable/9/sys/conf/kern.pre.mk
==============================================================================
--- stable/9/sys/conf/kern.pre.mk	Thu Dec 19 17:29:56 2013	(r259617)
+++ stable/9/sys/conf/kern.pre.mk	Thu Dec 19 18:06:52 2013	(r259618)
@@ -4,10 +4,11 @@
 # of the definitions that need to be before %BEFORE_DEPEND.
 
 .include <bsd.own.mk>
-.include <bsd.compiler.mk>
+.sinclude <bsd.compiler.mk>
 
 # backwards compat option for older systems.
 MACHINE_CPUARCH?=${MACHINE_ARCH:C/mipse[lb]/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
+COMPILER_TYPE?="gcc"
 
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL_KO?=	kernel

Modified: stable/9/sys/conf/kmod.mk
==============================================================================
--- stable/9/sys/conf/kmod.mk	Thu Dec 19 17:29:56 2013	(r259617)
+++ stable/9/sys/conf/kmod.mk	Thu Dec 19 18:06:52 2013	(r259618)
@@ -73,10 +73,15 @@ OBJCOPY?=	objcopy
 .endif
 
 .include <bsd.init.mk>
-.include <bsd.compiler.mk>
+.sinclude <bsd.compiler.mk>
+
+# backwards compat option for older systems.
+COMPILER_TYPE?="gcc"
 
 .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
 
+MK_CLANG_IS_CC ?= no
+
 # amd64 and mips use direct linking for kmod, all others use shared binaries
 .if ${MACHINE_CPUARCH} != amd64 && ${MACHINE_CPUARCH} != mips
 __KLD_SHARED=yes