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

Only build the libmagic build-tools if MK_FILE != no

Browse Source 
Before this patch libmagic was always built in the build-tools phase
even if -DWITHOUT_FILE was specified.

Reviewed by:	emaste, jhb
Approved by:	jhb (mentor)
Differential Revision: https://reviews.freebsd.org/D12925
This commit is contained in:
Alex Richardson 2017-11-13 20:07:08 +00:00
parent feeaec18d4
commit 7202739f7b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.inc1
View File

@ -1986,6 +1986,9 @@ _rescue=rescue/rescue
.if ${MK_TCSH} != "no" .if ${MK_TCSH} != "no"
_tcsh=bin/csh _tcsh=bin/csh
.endif .endif
.if ${MK_FILE} != "no"
_libmagic=lib/libmagic
.endif
# kernel-toolchain skips _cleanobj, so handle cleaning up previous # kernel-toolchain skips _cleanobj, so handle cleaning up previous
# build-tools directories if needed. # build-tools directories if needed.
@ -2002,7 +2005,7 @@ _bt_clean= ${CLEANDIR}
${_rescue} \ ${_rescue} \
${_share} \ ${_share} \
usr.bin/awk \ usr.bin/awk \
lib/libmagic \ ${_libmagic} \
usr.bin/mkesdb_static \ usr.bin/mkesdb_static \
usr.bin/mkcsmapper_static \ usr.bin/mkcsmapper_static \
usr.bin/vi/catalog \ usr.bin/vi/catalog \