Author: arichardson Date: Mon Nov 13 20:07:08 2017 New Revision: 325772 URL: https://svnweb.freebsd.org/changeset/base/325772
Log: 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 Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Mon Nov 13 19:58:58 2017 (r325771) +++ head/Makefile.inc1 Mon Nov 13 20:07:08 2017 (r325772) @@ -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 \ _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
