d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move inclusion of /etc/make.conf and others to old location (this also

Browse Source 
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...
This commit is contained in:
Warner Losh 2014-05-17 20:31:40 +00:00
parent 1f4e0ed969
commit 34bbee4317
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=266350
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
share/mk/sys.mk
View File

@ -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}