From owner-svn-src-stable@FreeBSD.ORG Thu Dec 19 18:06:53 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8F886C5F; Thu, 19 Dec 2013 18:06:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 602AB188A; Thu, 19 Dec 2013 18:06:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJI6rEm039754; Thu, 19 Dec 2013 18:06:53 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJI6qnU039748; Thu, 19 Dec 2013 18:06:52 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201312191806.rBJI6qnU039748@svn.freebsd.org> From: Warner Losh Date: Thu, 19 Dec 2013 18:06:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r259618 - stable/9/sys/conf X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 18:06:53 -0000 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 -.include +.sinclude # 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 -.include +.sinclude + +# 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