From owner-svn-src-all@FreeBSD.ORG Wed May 20 09:36:26 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 20E73E45; Wed, 20 May 2015 09:36:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0E60C1C94; Wed, 20 May 2015 09:36:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4K9aPYf059607; Wed, 20 May 2015 09:36:25 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4K9aPhf059606; Wed, 20 May 2015 09:36:25 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201505200936.t4K9aPhf059606@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 20 May 2015 09:36:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r283140 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2015 09:36:26 -0000 Author: ngie Date: Wed May 20 09:36:25 2015 New Revision: 283140 URL: https://svnweb.freebsd.org/changeset/base/283140 Log: Only build sys/boot/usb/tools if MK_USB != no Sponsored by: EMC / Isilon Storage Division Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Wed May 20 09:23:37 2015 (r283139) +++ head/Makefile.inc1 Wed May 20 09:36:25 2015 (r283140) @@ -1502,6 +1502,9 @@ _clang_libs= lib/clang _cc= gnu/usr.bin/cc .endif .endif +.if ${MK_USB} != "no" +_usb_tools= sys/boot/usb/tools +.endif cross-tools: .MAKE .for _tool in \ @@ -1512,7 +1515,7 @@ cross-tools: .MAKE ${_cc} \ ${_btxld} \ ${_crunchide} \ - sys/boot/usb/tools + ${_usb_tools} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ ${MAKE} DIRPRFX=${_tool}/ obj && \