summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-11-20 00:22:55 +0000
committerbdrewery <bdrewery@FreeBSD.org>2015-11-20 00:22:55 +0000
commitbeef81f7262bf7594454c24bdd1d396243d342b9 (patch)
tree8539fc9a9e2712349261a35a42f04a2883b12020 /share
parenta8b5c5bd6ebf6c98e7642cd557b81df5f7541272 (diff)
downloadFreeBSD-src-beef81f7262bf7594454c24bdd1d396243d342b9.zip
FreeBSD-src-beef81f7262bf7594454c24bdd1d396243d342b9.tar.gz
META MODE: Don't stage INTERNALPROGs.
This is only for sys/boot. INTERNALPROG is not a build tool, it is just a way to generate OBJS from a list of SRCS and use those objects elsewhere. Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'share')
-rw-r--r--share/mk/bsd.sys.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index cad2b2f..6eae174 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -194,13 +194,13 @@ staging stage_libs stage_files stage_as stage_links stage_symlinks:
DESTDIR= ${STAGE_OBJTOP}
.if commands(beforeinstall)
-.if !empty(_LIBS) || ${MK_STAGING_PROG} != "no"
+.if !empty(_LIBS) || (${MK_STAGING_PROG} != "no" && !defined(INTERNALPROG))
staging: beforeinstall
.endif
.endif
# normally only libs and includes are staged
-.if ${MK_STAGING_PROG} != "no"
+.if ${MK_STAGING_PROG} != "no" && !defined(INTERNALPROG)
STAGE_DIR.prog= ${STAGE_OBJTOP}${BINDIR}
.if !empty(PROG) || !empty(PROGS)
@@ -265,7 +265,7 @@ STAGE_TARGETS+= $t
STAGE_TARGETS+= stage_as
.endif
-.if !empty(_LIBS) || ${MK_STAGING_PROG} != "no"
+.if !empty(_LIBS) || (${MK_STAGING_PROG} != "no" && !defined(INTERNALPROG))
.if !empty(LINKS)
STAGE_TARGETS+= stage_links
OpenPOWER on IntegriCloud