d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that the makewhatis symlink is added in the bootstrap-tools stage

Browse Source 
We currently set MK_MAN=no in $BSARGS so MK_MAN_UTILS will also be false
which means that the makewhatis symlink will not be created.
This change fixes the build when using both -DBUILD_WITH_STRICT_TMPPATH and
-DBOOTSTRAP_ALL_TOOLS.

Tested by:	andrew
Differential Revision: https://reviews.freebsd.org/D16761
This commit is contained in:
Alex Richardson 2020-09-10 15:37:29 +00:00
parent 0a81de38dc
commit b7b5bdba96
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc1
View File

@ -723,7 +723,7 @@ BSARGS= DESTDIR= \
BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \
BWPHASE=${.TARGET:C,^_,,} \ BWPHASE=${.TARGET:C,^_,,} \
SSP_CFLAGS= \ SSP_CFLAGS= \
MK_HTML=no NO_LINT=yes MK_MAN=no \ MK_HTML=no NO_LINT=yes MK_MAN=no MK_MAN_UTILS=yes \
-DNO_PIC MK_PROFILE=no -DNO_SHARED \ -DNO_PIC MK_PROFILE=no -DNO_SHARED \
-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
MK_CLANG_EXTRAS=no MK_CLANG_FORMAT=no MK_CLANG_FULL=no \ MK_CLANG_EXTRAS=no MK_CLANG_FORMAT=no MK_CLANG_FULL=no \

2
usr.bin/mandoc/Makefile
View File

@ -14,6 +14,8 @@ MLINKS+= apropos.1 whatis.1
LINKS= ${BINDIR}/mandoc ${BINDIR}/whatis \ LINKS= ${BINDIR}/mandoc ${BINDIR}/whatis \
${BINDIR}/mandoc ${BINDIR}/makewhatis \ ${BINDIR}/mandoc ${BINDIR}/makewhatis \
${BINDIR}/mandoc ${BINDIR}/apropos ${BINDIR}/mandoc ${BINDIR}/apropos
.elif defined(BOOTSTRAPPING)
.error "MK_MAN_UTILS should be set to yes when bootstrapping"
.endif .endif
LIBMAN_SRCS= man.c \ LIBMAN_SRCS= man.c \