Author: bdrewery
Date: Fri Nov 20 00:22:55 2015
New Revision: 291087
URL: https://svnweb.freebsd.org/changeset/base/291087
Log:
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
Modified:
head/share/mk/bsd.sys.mk
Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk Thu Nov 19 22:54:37 2015 (r291086)
+++ head/share/mk/bsd.sys.mk Fri Nov 20 00:22:55 2015 (r291087)
@@ -194,13 +194,13 @@ staging stage_libs stage_files stage_as
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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
