From e42c83e6507dc8e93e739cba7b6314f3b6948bde Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Tue, 23 Feb 2021 07:21:52 +0100 Subject: [PATCH 2/3] bootstrap: add tic to the bootstrap tools --- Makefile.inc1 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 005d9d25afb..839d4d9db02 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2433,6 +2433,9 @@ ${_bt}-usr.sbin/config: ${_bt}-usr.bin/file2c ${_bt_lex_depend} # since "make" will usually point to GNU make there. _other_bootstrap_tools+=usr.bin/bmake +_other_bootstrap_tools+=lib/ncurses/ncurses +${_bt}-usr.bin/ncurses: ${_bt}-lib/ncurses/ncurses + # Avoid dependency on host bz2 headers: _other_bootstrap_tools+=lib/libbz2 ${_bt}-usr.bin/grep: ${_bt}-lib/libbz2 @@ -2479,6 +2482,7 @@ bootstrap-tools: ${_bt}-links .PHONY lib/libopenbsd \ usr.bin/mandoc \ usr.bin/rpcgen \ + lib/ncurses/ncurses \ ${_yacc} \ ${_m4} \ ${_lex} \ @@ -2493,6 +2497,7 @@ bootstrap-tools: ${_bt}-links .PHONY ${_nmtree} \ ${_vtfontcvt} \ ${_localedef} \ + usr.bin/ncurses \ ${LOCAL_BSTOOL_DIRS} ${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ @@ -2514,6 +2519,9 @@ ${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd ${_bt}-sbin/md5: ${_bt}-lib/libmd .endif +if target(${_bt}-usr.bin/ncurses) +${_bt}-usr.bin/ncurses: ${_bt}-lib/ncurses/ncurses +.endif # # build-tools: Build special purpose build tools -- 2.30.1