From 15bd171b59c4c5f09cc9236637bd9e698f44342d Mon Sep 17 00:00:00 2001 From: bdrewery Date: Fri, 23 Jun 2017 19:44:20 +0000 Subject: MFC r320012,r320028,r320061,r320118: r320012: Fix LIBAMU location to fix 'stale .depend' rebuilds in usr.sbin/amd. r320028: Fix more incorrect library directories fix 'stale .depend' rebuilds. r320061: Fix Makefiles which override LIBDIR to not add incorrect dependencies into .depend. r320118: Follow-up r320061: Need to respect make.conf/env LIBDIR overrides. Approved by: re (gjb) --- share/mk/local.sys.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'share/mk/local.sys.mk') diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index 73fe5f5..2693a69 100644 --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -39,6 +39,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*} != "" -- cgit v1.1