svn commit: r320118 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Mon Jun 19 18:08:02 2017
New Revision: 320118
URL: https://svnweb.freebsd.org/changeset/base/320118

Log:
  Follow-up r320061: Need to respect make.conf/env LIBDIR overrides.
  
  This fixes the lib32 build from creating all stale .depend files.
  
  X-MFC-With:	320061
  MFC after:	1 week
  Sponsored by:	Dell EMC Isilon

Modified:
  head/share/mk/bsd.own.mk
  head/share/mk/local.sys.mk

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Mon Jun 19 15:56:03 2017	(r320117)
+++ head/share/mk/bsd.own.mk	Mon Jun 19 18:08:02 2017	(r320118)
@@ -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

Modified: head/share/mk/local.sys.mk
==============================================================================
--- head/share/mk/local.sys.mk	Mon Jun 19 15:56:03 2017	(r320117)
+++ head/share/mk/local.sys.mk	Mon Jun 19 18:08:02 2017	(r320118)
@@ -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*} != ""