From 55f6623d83e2f730d3a923fdbb08198b84762e65 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Fri, 11 Mar 2016 23:44:59 +0000 Subject: [PATCH] Remove out-of-place make(buildincludes) check. This came in r239572 for META_MODE handling but it doesn't make sense since the staging is always done in make(all); make(buildincludes) is never actually ran in the META_MODE build. Reported by: bapt Sponsored by: EMC / Isilon Storage Division --- share/mk/bsd.files.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk index d22f19694d13..7925d83467c6 100644 --- a/share/mk/bsd.files.mk +++ b/share/mk/bsd.files.mk @@ -30,9 +30,7 @@ ${group}OWN?= ${SHAREOWN} ${group}GRP?= ${SHAREGRP} ${group}MODE?= ${SHAREMODE} ${group}DIR?= ${BINDIR} -.if !make(buildincludes) STAGE_SETS+= ${group} -.endif STAGE_DIR.${group}= ${STAGE_OBJTOP}${${group}DIR} _${group}FILES= @@ -49,9 +47,7 @@ ${group}NAME_${file:T}?= ${${group}NAME} .else ${group}NAME_${file:T}?= ${file:T} .endif -.if !make(buildincludes) STAGE_AS_SETS+= ${file:T} -.endif STAGE_AS_${file:T}= ${${group}NAME_${file:T}} # XXX {group}OWN,GRP,MODE STAGE_DIR.${file:T}= ${STAGE_OBJTOP}${${group}DIR_${file:T}}