svn commit: r282156 - head

[Ed Maste]

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 ${UNIVERSE_arm64} i386 mips pc98 powerpc sparc64
 TARGET_ARCHES_arm?=	arm armeb armv6 armv6hf
+TARGET_ARCHES_arm64?=	aarch64
 TARGET_ARCHES_mips?=	mipsel mips mips64el mips64 mipsn32
 TARGET_ARCHES_powerpc?=	powerpc powerpc64
 TARGET_ARCHES_pc98?=	i386