From owner-svn-src-all@FreeBSD.ORG Tue Apr 28 19:21:34 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 CA46BC17; Tue, 28 Apr 2015 19:21:34 +0000 (UTC) Received: from mail-ob0-x235.google.com (mail-ob0-x235.google.com [IPv6:2607:f8b0:4003:c01::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 876CF1B25; Tue, 28 Apr 2015 19:21:34 +0000 (UTC) Received: by obbeb7 with SMTP id eb7so3931058obb.3; Tue, 28 Apr 2015 12:21:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:mime-version:content-type:from:in-reply-to:date:cc :message-id:references:to; bh=9q9xSW31J/PsbTKSn0Y8QCHb5ePelfz2HLtBBL6L8H4=; b=TazZQcWb9aW5yt7VS7RwJ4dunLbIyEwS9pvFfOfxa7rATtGdOCCT3gWFZokHhDvN1q +QUfHfKIjhv8NRHdNuo1bnidIu5Qdp0fuusdhZOCjL4HTw1SZ77g5tPO7+TTIWMK7tOb +a9dxYjjqViZ+q553/7S9u58cs0CkeHL9bO+8CV2Zv9Ky8e56GierR7h1eAPNentq8ik nPLYQ5XjPYNR+DtR1NrOq88C23jw1YVsLAuduAEKdiKkh47lFtqGnAdexCEmJbQaej6b WfSC6kvd1W/rgXFo6pvTloUPhKp+/xxuwDLAIltxslwj19XBLpIVNAGpgGxgybefrK9s FYDw== X-Received: by 10.202.78.66 with SMTP id c63mr15055561oib.0.1430248893728; Tue, 28 Apr 2015 12:21:33 -0700 (PDT) Received: from ?IPv6:2601:8:ab80:7d6:18c2:d415:1263:eb4c? ([2601:8:ab80:7d6:18c2:d415:1263:eb4c]) by mx.google.com with ESMTPSA id w81sm13732577oia.6.2015.04.28.12.21.32 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 28 Apr 2015 12:21:33 -0700 (PDT) Subject: Re: svn commit: r282156 - head Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Content-Type: multipart/signed; boundary="Apple-Mail=_F687196A-608A-4961-84AE-28BB09776064"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5b6 From: Garrett Cooper In-Reply-To: <20150428190445.798316bb@bender> Date: Tue, 28 Apr 2015 12:21:29 -0700 Cc: Ed Maste , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Message-Id: References: <201504281713.t3SHD5UW096783@svn.freebsd.org> <42F6A579-082C-4159-8E16-1C8B69B0A3AE@gmail.com> <20150428190445.798316bb@bender> To: Andrew Turner X-Mailer: Apple Mail (2.1878.6) 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: Tue, 28 Apr 2015 19:21:34 -0000 --Apple-Mail=_F687196A-608A-4961-84AE-28BB09776064 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Apr 28, 2015, at 11:04, Andrew Turner wrote: > On Tue, 28 Apr 2015 10:53:57 -0700 > Garrett Cooper wrote: =85 >> Why just amd64/arm here? >=20 > You're missing part of the line, it contains all architectures with > arm64 being optional: >=20 > +TARGETS?=3Damd64 arm ${UNIVERSE_arm64} i386 mips pc98 powerpc sparc64 Hi Andrew, Oh, ok. It was a bit hard for me to read :/... I had a different change I was going to post up on Phabricator (pasted = below). The goal of my diff was two-fold: - allow people to override the universe target (in this case = universe_arm64) to skip the one generated for make universe below. - always add arm64, but enable universe_arm64 only if binutils was = installed on the build host. I could do the equivalent for the TARGET_ARCHES loop if desired. Thanks! -NGie $ svn diff Makefile Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- Makefile (revision 282108) +++ Makefile (working copy) @@ -373,19 +373,15 @@ # existing system is. # .if make(universe) || make(universe_kernels) || make(tinderbox) || = make(targets) -TARGETS?=3Damd64 arm i386 mips pc98 powerpc sparc64 +TARGETS?=3Damd64 arm arm64 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+=3Darm64 -TARGET_ARCHES_arm64?=3D aarch64 -.else -universe: universe_arm64_skip -universe_epilogue: universe_arm64_skip -universe_arm64_skip: universe_prologue +.if !exists(/usr/local/aarch64-freebsd/bin/ld) +universe_arm64: @echo ">> arm64 skipped - install aarch64-binutils port or = package to build" .endif TARGET_ARCHES_arm?=3D arm armeb armv6 armv6hf +TARGET_ARCHES_arm64?=3D aarch64 TARGET_ARCHES_mips?=3D mipsel mips mips64el mips64 mipsn32 TARGET_ARCHES_powerpc?=3D powerpc powerpc64 TARGET_ARCHES_pc98?=3D i386 @@ -427,6 +423,7 @@ .for target in ${TARGETS} universe: universe_${target} universe_epilogue: universe_${target} +.if !target(universe_${target}) universe_${target}: universe_${target}_prologue universe_${target}_prologue: universe_prologue @echo ">> ${target} started on `LC_ALL=3DC date`" @@ -454,6 +451,7 @@ .endfor .endif universe_${target}: universe_${target}_kernels +.endif universe_${target}_kernels: universe_${target}_prologue .MAKE .if exists(${KERNSRCDIR}/${target}/conf/NOTES) @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=3D/dev/null = \ --Apple-Mail=_F687196A-608A-4961-84AE-28BB09776064 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJVP926AAoJEMZr5QU6S73e+TwH/1nvWNYNlGcsTp51m75fzRyE IXSCMoXjddDS3aJ7s7uR/VumQPeoYX/I0fqlMTPNQoQug8oiRukDHgW82BUyhaN0 23cSYWomqrCZBIOgjlWgWxIP4LS/1BkxrSC6LJgXSB2rEZrV9+FgFENq1+Wdcq5B jYHGyqhWFU/T1dLF0hDi6nlvF/I4P8OlLUGBiD+QIo4OdIRGO9VCMyk3ePjF2o5o o96LS/hkhmxFw8AEUZwHR/f+Xx8wEgvGm3fo6OCKSQvagNKT9nCtX58JiICgMlpf 0DmCteQ1iz+4OnLJYV6avnC0WCHCqRNCDIHHLtJVMjIfJgWn7xApuMasw/acABI= =BlYZ -----END PGP SIGNATURE----- --Apple-Mail=_F687196A-608A-4961-84AE-28BB09776064--