Author: bdrewery
Date: Fri Dec 4 18:07:44 2015
New Revision: 291790
URL: https://svnweb.freebsd.org/changeset/base/291790
Log:
MFC r289289,r290181:
r289289:
Fix support for building a PROG_CXX, and PROG, directly.
r290181:
Unbreak bsd.progs.mk with PROGS (but not PROGS_CXX) and when invoking the
"one of many" targets, e.g. `make hello_world`, where hello_world is a C
program
Modified:
stable/10/share/mk/bsd.progs.mk
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/share/mk/bsd.progs.mk
==============================================================================
--- stable/10/share/mk/bsd.progs.mk Fri Dec 4 18:06:47 2015
(r291789)
+++ stable/10/share/mk/bsd.progs.mk Fri Dec 4 18:07:44 2015
(r291790)
@@ -35,6 +35,9 @@ UPDATE_DEPENDFILE_PROG?= no
# They may have asked us to build just one
.for t in ${PROGS}
.if make($t)
+.if ${PROGS_CXX:U:M${t}}
+PROG_CXX ?= $t
+.endif
PROG ?= $t
.endif
.endfor
@@ -67,7 +70,7 @@ UPDATE_DEPENDFILE ?= NO
# ensure that we don't clobber each other's dependencies
DEPENDFILE?= .depend.${PROG}
# prog.mk will do the rest
-.else
+.else # !defined(PROG)
all: ${PROGS}
# We cannot capture dependencies for meta mode here
@@ -88,7 +91,7 @@ $v =
# handle being called [bsd.]progs.mk
.include <bsd.prog.mk>
-.if !empty(PROGS) && !defined(_RECURSING_PROGS)
+.if !empty(PROGS) && !defined(_RECURSING_PROGS) && !defined(PROG)
# tell progs.mk we might want to install things
PROGS_TARGETS+= checkdpadd clean cleandepend cleandir depend install
@@ -141,4 +144,4 @@ $p.$t: .PHONY .MAKE
.for t in ${PROGS_TARGETS:O:u}
$t: ${PROGS:%=%.$t}
.endfor
-.endif
+.endif # !empty(PROGS) && !defined(_RECURSING_PROGS) && !defined(PROG)
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
