From owner-svn-src-all@freebsd.org Wed Sep 4 18:32:12 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 89313C9B13; Wed, 4 Sep 2019 18:32:12 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Nsqc2w0Rz3FCY; Wed, 4 Sep 2019 18:32:12 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 477341FAB6; Wed, 4 Sep 2019 18:32:12 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x84IWCRu093678; Wed, 4 Sep 2019 18:32:12 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x84IWCvd093677; Wed, 4 Sep 2019 18:32:12 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201909041832.x84IWCvd093677@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 4 Sep 2019 18:32:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351823 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 351823 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Sep 2019 18:32:12 -0000 Author: bdrewery Date: Wed Sep 4 18:32:11 2019 New Revision: 351823 URL: https://svnweb.freebsd.org/changeset/base/351823 Log: PROGS: Build common sources before recursed PROGS_TARGETS as well when building. MFC after: 2 weeks Sponsored by: DellEMC Modified: head/share/mk/bsd.progs.mk Modified: head/share/mk/bsd.progs.mk ============================================================================== --- head/share/mk/bsd.progs.mk Wed Sep 4 18:00:54 2019 (r351822) +++ head/share/mk/bsd.progs.mk Wed Sep 4 18:32:11 2019 (r351823) @@ -92,6 +92,7 @@ $v = # handle being called [bsd.]progs.mk .include +.if !defined(_SKIP_BUILD) # Find common sources among the PROGS to depend on them before building # anything. This allows parallelization without them each fighting over # the same objects. @@ -118,6 +119,7 @@ _PROGS_COMMON_OBJS+= ${_PROGS_COMMON_SRCS:N*.[dhly]:${ !empty(.MAKE.MODE:Mmeta) ${_PROGS_COMMON_OBJS}: .NOMETA .endif +.endif .if !empty(PROGS) && !defined(_RECURSING_PROGS) && !defined(PROG) # tell progs.mk we might want to install things @@ -132,11 +134,6 @@ _PROG_MK.cleanobj= CLEANDEPENDFILES= CLEANDEPENDDIRS= PROGS_TARGETS+= cleandir cleanobj .endif -# Ensure common objects are built before recursing. -.if !empty(_PROGS_COMMON_OBJS) -${PROGS}: ${_PROGS_COMMON_OBJS} -.endif - .for p in ${PROGS} .if defined(PROGS_CXX) && !empty(PROGS_CXX:M$p) # bsd.prog.mk may need to know this @@ -144,7 +141,7 @@ x.$p= PROG_CXX=$p .endif # Main PROG target -$p ${p}_p: .PHONY .MAKE +$p ${p}_p: .PHONY .MAKE ${_PROGS_COMMON_OBJS} (cd ${.CURDIR} && \ DEPENDFILE=.depend.$p \ NO_SUBDIR=1 ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS=t \ @@ -152,7 +149,7 @@ $p ${p}_p: .PHONY .MAKE # Pseudo targets for PROG, such as 'install'. .for t in ${PROGS_TARGETS:O:u} -$p.$t: .PHONY .MAKE +$p.$t: .PHONY .MAKE ${_PROGS_COMMON_OBJS} (cd ${.CURDIR} && \ DEPENDFILE=.depend.$p \ NO_SUBDIR=1 ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS=t \