diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2017-03-22 18:35:48 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2017-03-22 18:35:48 +0000 |
commit | 34e7528f0d56479d4d42e04e6426cff208f2d37d (patch) | |
tree | 9fe65ef3e2ecc9ad67029c2d9dd2ebfb83fa7ff3 /Makefile.inc1 | |
parent | de345ac57bddfaff4de7c06f64b22d56468ff318 (diff) | |
download | FreeBSD-src-34e7528f0d56479d4d42e04e6426cff208f2d37d.zip FreeBSD-src-34e7528f0d56479d4d42e04e6426cff208f2d37d.tar.gz |
MFC r314709,r314790,r314794:
r314709:
Fix bootstrapping mtree after r313404 for older systems.
r314790:
Added comments for why nmtree/libmd are bootstrapped.
r314794:
Fix bootstrapping libmd on older systems after r314709.
PR: 217673
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index a9f6c0e..04466b5 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1323,10 +1323,14 @@ ${_bt}-usr.bin/yacc: ${_bt}-lib/liby _crunch= usr.sbin/crunch .endif -.if ${BOOTSTRAPPING} < 1000026 -_nmtree= lib/libnetbsd \ +# r245440 mtree -N support added +# r313404 requires sha384.h for libnetbsd, added to libmd in r292782 +.if ${BOOTSTRAPPING} < 1003512 +_nmtree= lib/libmd \ + lib/libnetbsd \ usr.sbin/nmtree +${_bt}-lib/libnetbsd: ${_bt}-lib/libmd ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libnetbsd .endif |