diff options
author | imp <imp@FreeBSD.org> | 2014-05-17 20:31:40 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2014-05-17 20:31:40 +0000 |
commit | 578932e7e1aa3ac81e478453ed60540f5220cce5 (patch) | |
tree | 84590e1cbf258fd68e6e75ace4a2e5b7aaa782b9 /share | |
parent | 80aea54bcdd8dad250c9963f7c760adbe9f11a69 (diff) | |
download | FreeBSD-src-578932e7e1aa3ac81e478453ed60540f5220cce5.zip FreeBSD-src-578932e7e1aa3ac81e478453ed60540f5220cce5.tar.gz |
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...
Diffstat (limited to 'share')
-rw-r--r-- | share/mk/sys.mk | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 634b130..9f5852c 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -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} |