diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2017-06-23 19:44:20 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2017-06-23 19:44:20 +0000 |
| commit | 15bd171b59c4c5f09cc9236637bd9e698f44342d (patch) | |
| tree | 4b788d2e65004aeb1ad387f37ac01250d09316f0 /share/mk/local.sys.mk | |
| parent | b9a8cab5550b12a8079f4e625b91315ac09467f9 (diff) | |
| download | FreeBSD-src-15bd171b59c4c5f09cc9236637bd9e698f44342d.zip FreeBSD-src-15bd171b59c4c5f09cc9236637bd9e698f44342d.tar.gz | |
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)
Diffstat (limited to 'share/mk/local.sys.mk')
| -rw-r--r-- | share/mk/local.sys.mk | 4 |
1 files changed, 4 insertions, 0 deletions
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*} != "" |
