hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-30 05:01:39 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix makeman creating obj directories due to turning on WITH_AUTO_OBJ.

Browse Source 
r284708 addressed this slightly but seems to have put the make(showconfig)
guard in the wrong place.  Rather than guard setting the default obj directory,
guard inclusion of auto.obj.mk.  This avoids creating SRCTOP/obj and
SRCTOP/release/obj when running makeman.

Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
bdrewery 2015-09-17 16:38:32 +00:00
parent 870d2cd235
commit f09841e04b
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/mk/local.meta.sys.mk
View File

@ -10,7 +10,6 @@ MK_INSTALL_AS_USER= yes
_default_makeobjdir=$${.CURDIR:S,^$${SRCTOP},$${OBJTOP},}
.if empty(OBJROOT) || ${.MAKE.LEVEL} == 0
.if !make(showconfig)
.if defined(MAKEOBJDIRPREFIX)
# put things approximately where they want
OBJROOT:=${MAKEOBJDIRPREFIX}${SRCTOP}/
@ -25,7 +24,6 @@ MAKEOBJDIR=${_default_makeobjdir}
# Expand for our own use
MAKEOBJDIR:= ${MAKEOBJDIR}
.endif
.endif
.if !empty(SB)
SB_OBJROOT ?= ${SB}/obj/
# this is what we use below

4
share/mk/sys.mk
View File

@ -47,8 +47,8 @@ __DEFAULT_DEPENDENT_OPTIONS= \
.endif
.if ${MK_AUTO_OBJ} == "yes"
# This needs to be done early - before .PATH is computed
# Don't do this if just running make -V
.if ${.MAKEFLAGS:M-V} == ""
# Don't do this if just running 'make -V' or 'make showconfig'
.if ${.MAKEFLAGS:M-V} == "" && !make(showconfig)
.sinclude <auto.obj.mk>
.endif
.endif