git: 50179c5ec7d0 - main - Makefile.inc1: unbreak bootstrap when kbdcontrol does not exist

Glen Barber gjb at FreeBSD.org
Wed Mar 24 00:47:33 UTC 2021


The branch main has been updated by gjb:

URL: https://cgit.FreeBSD.org/src/commit/?id=50179c5ec7d09d7b02497caf95dca5d33f93bcd9

commit 50179c5ec7d09d7b02497caf95dca5d33f93bcd9
Author:     Glen Barber <gjb at FreeBSD.org>
AuthorDate: 2021-03-24 00:47:14 +0000
Commit:     Glen Barber <gjb at FreeBSD.org>
CommitDate: 2021-03-24 00:47:14 +0000

    Makefile.inc1: unbreak bootstrap when kbdcontrol does not exist
    
    Reviewed by:            arichardson
    MFC after:              12 hours
    MFC target:             stable/13, releng/13.0
    Differential Review:    https://reviews.freebsd.org/D29200
    Sponsored by:           Rubicon Communications, LLC ("Netgate")
---
 Makefile.inc1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 005d9d25afb3..5ae1ec72c279 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


More information about the dev-commits-src-main mailing list