From owner-svn-src-head@FreeBSD.ORG Sat May 17 01:47:07 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A48947A9; Sat, 17 May 2014 01:47:07 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 77C2D2E8F; Sat, 17 May 2014 01:47:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4H1l7Dp081738; Sat, 17 May 2014 01:47:07 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4H1l6nW081735; Sat, 17 May 2014 01:47:06 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201405170147.s4H1l6nW081735@svn.freebsd.org> From: Warner Losh Date: Sat, 17 May 2014 01:47:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r266278 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 May 2014 01:47:07 -0000 Author: imp Date: Sat May 17 01:47:06 2014 New Revision: 266278 URL: http://svnweb.freebsd.org/changeset/base/266278 Log: Read in SRCCONF early and consistently, if src.sys.mk exists, which is should for all normal builds. Read /etc/make.conf earlier than before, but consistently before SRCCONF and local.sys.mk. Added: head/share/mk/src.sys.mk (contents, props changed) Modified: head/share/mk/src.opts.mk head/share/mk/sys.mk Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Sat May 17 00:53:12 2014 (r266277) +++ head/share/mk/src.opts.mk Sat May 17 01:47:06 2014 (r266278) @@ -30,13 +30,6 @@ .if !target(____) ____: -# Allow user to configure things that only effect src tree builds. -SRCCONF?= /etc/src.conf -.if exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf" -.include "${SRCCONF}" -.endif - -# Must be included after src.conf .include # Added: head/share/mk/src.sys.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/mk/src.sys.mk Sat May 17 01:47:06 2014 (r266278) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +# Allow user to configure things that only effect src tree builds. +SRCCONF?= /etc/src.conf +.if exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf" +.include "${SRCCONF}" +.endif Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Sat May 17 00:53:12 2014 (r266277) +++ head/share/mk/sys.mk Sat May 17 01:47:06 2014 (r266278) @@ -14,11 +14,22 @@ unix ?= We run FreeBSD, not UNIX. # for something different in FreeBSD. # MACHINE_CPUARCH=${MACHINE_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/powerpc64/powerpc/} + +# Pull in global settings. +__MAKE_CONF?=/etc/make.conf +.if exists(${__MAKE_CONF}) +.include "${__MAKE_CONF}" .endif +# Setup anything for the FreeBSD source build, if we're building +# inside the source tree. Needs to be after make.conf, but before +# local stuff. +.sinclude + # Set any local definitions first. Place this early, but it needs # MACHINE_CPUARCH to be defined. .sinclude +.endif # If the special target .POSIX appears (without prerequisites or # commands) before the first noncomment line in the makefile, make shall @@ -314,12 +325,6 @@ YFLAGS ?= -d rm -f ${.PREFIX}.tmp.c ${CTFCONVERT_CMD} -# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. -__MAKE_CONF?=/etc/make.conf -.if exists(${__MAKE_CONF}) -.include "${__MAKE_CONF}" -.endif - .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) SHELL= ${__MAKE_SHELL} .SHELL: path=${__MAKE_SHELL}