diff options
| author | Alex Richardson <arichardson@FreeBSD.org> | 2017-11-13 20:07:08 +0000 |
|---|---|---|
| committer | Alex Richardson <arichardson@FreeBSD.org> | 2017-11-13 20:07:08 +0000 |
| commit | 7202739f7b928bd1c6ec5c999783a671cbf5f374 (patch) | |
| tree | 035f35fe5adbff027b4cb73804f9de8f54aaa790 /Makefile.inc1 | |
| parent | feeaec18d47bdbcba15bd9214a34762376d08c04 (diff) | |
| download | src-test2-7202739f7b928bd1c6ec5c999783a671cbf5f374.tar.gz src-test2-7202739f7b928bd1c6ec5c999783a671cbf5f374.zip | |
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
Notes
Notes:
svn path=/head/; revision=325772
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 5 |
1 files changed, 4 insertions, 1 deletions
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 \ |