Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 28 Mar 2021 18:27:39 GMT
From:      Glen Barber <gjb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: b56440b34356 - releng/13.0 - Makefile.inc1: unbreak bootstrap when kbdcontrol does not exist
Message-ID:  <202103281827.12SIRdPr006748@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch releng/13.0 has been updated by gjb:

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

commit b56440b34356282a9b659366341d81e620e515e5
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-03-24 00:47:14 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2021-03-28 18:27:29 +0000

    Makefile.inc1: unbreak bootstrap when kbdcontrol does not exist
    
    Approved by:            re (cperciva)
    Submitted by:           Evgeniy Khramtsov
    Reviewed by:            arichardson
    Sponsored by:           Rubicon Communications, LLC ("Netgate")
    
    (cherry picked from commit 50179c5ec7d09d7b02497caf95dca5d33f93bcd9)
    (cherry picked from commit 1048c56784c0e1d044b6828b030f326e48eaba28)
---
 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



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