From 759461bcf27f2128274677e09aa1b41f53a6d6f7 Mon Sep 17 00:00:00 2001 From: arichardson Date: Mon, 13 Nov 2017 20:07:08 +0000 Subject: [PATCH] Only build the libmagic build-tools if MK_FILE != no 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 --- Makefile.inc1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index cc1c4832b403..0b27de1c61ee 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1986,6 +1986,9 @@ _rescue=rescue/rescue .if ${MK_TCSH} != "no" _tcsh=bin/csh .endif +.if ${MK_FILE} != "no" +_libmagic=lib/libmagic +.endif # kernel-toolchain skips _cleanobj, so handle cleaning up previous # build-tools directories if needed. @@ -2002,7 +2005,7 @@ _bt_clean= ${CLEANDIR} ${_rescue} \ ${_share} \ usr.bin/awk \ - lib/libmagic \ + ${_libmagic} \ usr.bin/mkesdb_static \ usr.bin/mkcsmapper_static \ usr.bin/vi/catalog \