From owner-svn-src-head@FreeBSD.ORG Tue Apr 28 18:05:23 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 44E8C1A1; Tue, 28 Apr 2015 18:05:23 +0000 (UTC) Received: from kif.fubar.geek.nz (kif.fubar.geek.nz [178.62.119.249]) by mx1.freebsd.org (Postfix) with ESMTP id 109491130; Tue, 28 Apr 2015 18:05:22 +0000 (UTC) Received: from bender (bender.sec.cl.cam.ac.uk [IPv6:2001:630:212:2a8:4e72:b9ff:fe93:61bf]) by kif.fubar.geek.nz (Postfix) with ESMTPSA id 8BC1BD7A6F; Tue, 28 Apr 2015 18:04:45 +0000 (UTC) Date: Tue, 28 Apr 2015 19:04:45 +0100 From: Andrew Turner To: Garrett Cooper Cc: Ed Maste , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r282156 - head Message-ID: <20150428190445.798316bb@bender> In-Reply-To: <42F6A579-082C-4159-8E16-1C8B69B0A3AE@gmail.com> References: <201504281713.t3SHD5UW096783@svn.freebsd.org> <42F6A579-082C-4159-8E16-1C8B69B0A3AE@gmail.com> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.27; amd64-portbld-freebsd10.0) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 18:05:23 -0000 On Tue, 28 Apr 2015 10:53:57 -0700 Garrett Cooper wrote: > > > On Apr 28, 2015, at 10:13, Ed Maste wrote: > > > > Author: emaste > > Date: Tue Apr 28 17:13:05 2015 > > New Revision: 282156 > > URL: https://svnweb.freebsd.org/changeset/base/282156 > > > > Log: > > Don't add arm64 to universe builds if the user provided a TARGETS > > list > > > > Differential Revision: https://reviews.freebsd.org/D2375 > > Reported by: andrew > > Reviewed by: andrew, imp > > Sponsored by: The FreeBSD Foundation > > > > Modified: > > head/Makefile > > > > Modified: head/Makefile > > ============================================================================== > > --- head/Makefile Tue Apr 28 17:05:55 2015 (r282155) > > +++ head/Makefile Tue Apr 28 17:13:05 2015 (r282156) > > @@ -373,19 +373,19 @@ kernel-toolchains: > > # existing system is. > > # > > .if make(universe) || make(universe_kernels) || make(tinderbox) || > > make(targets) -TARGETS?=amd64 arm i386 mips pc98 powerpc sparc64 > > # XXX Add arm64 to universe only if we have an external binutils > > installed. # It does not build with the in-tree linker. > > .if exists(/usr/local/aarch64-freebsd/bin/ld) > > -TARGETS+=arm64 > > -TARGET_ARCHES_arm64?= aarch64 > > -.else > > +UNIVERSE_arm64=arm64 > > +.elif empty(${TARGETS}) > > universe: universe_arm64_skip > > universe_epilogue: universe_arm64_skip > > universe_arm64_skip: universe_prologue > > @echo ">> arm64 skipped - install aarch64-binutils port or > > package to build" .endif > > +TARGETS?=amd64 arm > > Why just amd64/arm here? You're missing part of the line, it contains all architectures with arm64 being optional: +TARGETS?=amd64 arm ${UNIVERSE_arm64} i386 mips pc98 powerpc sparc64 Andrew