Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Mar 2016 18:57:34 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r296743 - stable/10/share/mk
Message-ID:  <201603121857.u2CIvYaY070259@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Sat Mar 12 18:57:34 2016
New Revision: 296743
URL: https://svnweb.freebsd.org/changeset/base/296743

Log:
  MFC r295994,r296000:
  
    r295994:
      PROGS: Remove the 'build one' optimization since it breaks 'build multiple'
    r296000:
      PROGS: Only the main process will install INCS.

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	Sat Mar 12 18:55:48 2016	(r296742)
+++ stable/10/share/mk/bsd.progs.mk	Sat Mar 12 18:57:34 2016	(r296743)
@@ -31,18 +31,6 @@ UPDATE_DEPENDFILE_PROG = ${PROGS:[1]}
 UPDATE_DEPENDFILE_PROG?= no
 .endif
 
-.ifndef PROG
-# 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
-.endif
-
 .if defined(PROG)
 # just one of many
 PROG_OVERRIDE_VARS +=	BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_WERROR \
@@ -82,7 +70,7 @@ UPDATE_DEPENDFILE = NO
 
 # These are handled by the main make process.
 .ifdef _RECURSING_PROGS
-_PROGS_GLOBAL_VARS= CLEANFILES CLEANDIRS FILESGROUPS SCRIPTS
+_PROGS_GLOBAL_VARS= CLEANFILES CLEANDIRS FILESGROUPS INCSGROUPS SCRIPTS
 .for v in ${_PROGS_GLOBAL_VARS}
 $v =
 .endfor



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603121857.u2CIvYaY070259>