Date: Sat, 17 May 2014 20:31:41 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r266350 - head/share/mk Message-ID: <201405172031.s4HKVf0B076284@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sat May 17 20:31:40 2014 New Revision: 266350 URL: http://svnweb.freebsd.org/changeset/base/266350 Log: Move inclusion of /etc/make.conf and others to old location (this also moves local.sys.mk). The new location broke adding things to CXXFLAGS in /etc/src.conf with +=. Move it back until that's sorted out... Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Sat May 17 20:31:34 2014 (r266349) +++ head/share/mk/sys.mk Sat May 17 20:31:40 2014 (r266350) @@ -14,21 +14,6 @@ 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 <src.sys.mk> - -# Set any local definitions first. Place this early, but it needs -# MACHINE_CPUARCH to be defined. -.sinclude <local.sys.mk> .endif # If the special target .POSIX appears (without prerequisites or @@ -325,6 +310,21 @@ YFLAGS ?= -d rm -f ${.PREFIX}.tmp.c ${CTFCONVERT_CMD} +# 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 <src.sys.mk> + +# Set any local definitions first. Place this early, but it needs +# MACHINE_CPUARCH to be defined. +.sinclude <local.sys.mk> + .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) SHELL= ${__MAKE_SHELL} .SHELL: path=${__MAKE_SHELL}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405172031.s4HKVf0B076284>