The branch stable/13 has been updated by gjb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=1048c56784c0e1d044b6828b030f326e48eaba28
commit 1048c56784c0e1d044b6828b030f326e48eaba28
Author: Glen Barber <g...@freebsd.org>
AuthorDate: 2021-03-24 00:47:14 +0000
Commit: Glen Barber <g...@freebsd.org>
CommitDate: 2021-03-28 17:49:34 +0000
Makefile.inc1: unbreak bootstrap when kbdcontrol does not exist
Submitted by: Evgeniy Khramtsov
Reviewed by: arichardson
Sponsored by: Rubicon Communications, LLC ("Netgate")
(cherry picked from commit 50179c5ec7d09d7b02497caf95dca5d33f93bcd9)
---
Makefile.inc1 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index f27cd2706359..288d16a7574e 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2299,7 +2299,8 @@ _bootstrap_tools_links+=crunchgen
# Note: kbdcontrol can not be bootstrapped on non-FreeBSD systems
.if !defined(CROSSBUILD_HOST)
.if (${BOOTSTRAPPING} < 1003501 || \
- (${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103))
+ (${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103) || \
+ (!exists(/usr/sbin/kbdcontrol)))
_kbdcontrol= usr.sbin/kbdcontrol
.else
_bootstrap_tools_links+=kbdcontrol
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
