svn commit: r320701 - in head: bin sbin usr.bin usr.sbin
Ngie Cooper
ngie at FreeBSD.org
Thu Jul 6 04:15:32 UTC 2017
Author: ngie
Date: Thu Jul 6 04:15:30 2017
New Revision: 320701
URL: https://svnweb.freebsd.org/changeset/base/320701
Log:
Remove SUBDIR ordering/uniquifying in *bin/Makefile
After the addition of SUBDIR.yes, uniquifying/ordering the SUBDIRs doesn't
make a whole lot of sense, and it's in effect a half measure.
Ordering SUBDIR (after adding SUBDIR.yes to it) in bsd.subdir.mk is a
separate change that warrants more discussion/testing, because while
the SUBDIR_PARALLEL work largely fixed dependency ordering for SUBDIRs,
there might be downstream FreeBSD consumers that rely on the SUBDIR
ordering.
MFC after: 2 months
Reviewed by: bdrewery
Differential Revision: D11398
Modified:
head/bin/Makefile
head/sbin/Makefile
head/usr.bin/Makefile
head/usr.sbin/Makefile
Modified: head/bin/Makefile
==============================================================================
--- head/bin/Makefile Thu Jul 6 04:06:25 2017 (r320700)
+++ head/bin/Makefile Thu Jul 6 04:15:30 2017 (r320701)
@@ -47,8 +47,6 @@ SUBDIR.${MK_TESTS}+= tests
.include <bsd.arch.inc.mk>
-SUBDIR:= ${SUBDIR:O}
-
SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
Modified: head/sbin/Makefile
==============================================================================
--- head/sbin/Makefile Thu Jul 6 04:06:25 2017 (r320700)
+++ head/sbin/Makefile Thu Jul 6 04:15:30 2017 (r320701)
@@ -93,8 +93,6 @@ SUBDIR.${MK_TESTS}+= tests
.include <bsd.arch.inc.mk>
-SUBDIR:= ${SUBDIR:O}
-
SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile Thu Jul 6 04:06:25 2017 (r320700)
+++ head/usr.bin/Makefile Thu Jul 6 04:15:30 2017 (r320701)
@@ -306,8 +306,6 @@ SUBDIR+= mkesdb_static
.include <bsd.arch.inc.mk>
-SUBDIR:= ${SUBDIR:O:u}
-
SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile Thu Jul 6 04:06:25 2017 (r320700)
+++ head/usr.sbin/Makefile Thu Jul 6 04:15:30 2017 (r320701)
@@ -218,8 +218,6 @@ SUBDIR.${MK_TESTS}+= tests
.include <bsd.arch.inc.mk>
-SUBDIR:= ${SUBDIR:O}
-
SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
More information about the svn-src-all
mailing list