mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-10 09:42:26 +00:00
Code Issues Releases Activity

Follow-up r320061: Need to respect make.conf/env LIBDIR overrides.

Browse Source 
This fixes the lib32 build from creating all stale .depend files.

X-MFC-With:	320061
MFC after:	1 week
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Bryan Drewery 2017-06-19 18:08:02 +00:00
parent 711dba24d7
commit ad706c65e1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=320118
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
share/mk/bsd.own.mk
View File

@ -152,6 +152,11 @@ DTBOWN?= root
DTBGRP?= wheel
DTBMODE?= 444
# Use make.conf / environment LIBDIR as default if set...
.if !empty(_PREMK_LIBDIR)
LIBDIR_BASE?= ${_PREMK_LIBDIR}
.endif
# otherwise use our expected default value.
LIBDIR_BASE?= /usr/lib
LIBDIR?= ${LIBDIR_BASE}
LIBCOMPATDIR?= /usr/lib/compat

4
share/mk/local.sys.mk
View File

@ -42,6 +42,10 @@ MAKE_PRINT_VAR_ON_ERROR += .MAKE.MAKEFILES .PATH
OBJTOP?= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP}
.endif
.if !empty(LIBDIR)
_PREMK_LIBDIR:= ${LIBDIR}
.endif
.include "src.sys.mk"
.if ${.MAKE.MODE:Mmeta*} != ""