svn commit: r301938 - head

[Bryan Drewery]

Author: bdrewery
Date: Wed Jun 15 23:58:00 2016
New Revision: 301938
URL: https://svnweb.freebsd.org/changeset/base/301938

Log:
  tinderbox/universe: Only show arm64 warning if it was in the TARGETS list.
  
  This was a flaw in my change in r287903 but also in the original change
  in r282156 since it used empty(${TARGETS}) rather than empty(TARGETS).
  
  Reported by:	lidl
  Approved by:	re (gjb)
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Makefile

Modified: head/Makefile
==============================================================================
--- head/Makefile	Wed Jun 15 23:57:57 2016	(r301937)
+++ head/Makefile	Wed Jun 15 23:58:00 2016	(r301938)
@@ -418,9 +418,9 @@ TARGET_ARCHES_pc98?=	i386
 TARGET_ARCHES_${target}?= ${target}
 .endfor
 
-# XXX Add arm64 to universe only if we have an external binutils installed.
+# XXX Remove arm64 from universe if the required binutils package is missing.
 # It does not build with the in-tree linker.
-.if !exists(/usr/local/aarch64-freebsd/bin/ld) && empty(${TARGETS})
+.if !exists(/usr/local/aarch64-freebsd/bin/ld) && ${TARGETS:Marm64}
 _UNIVERSE_TARGETS:= ${_UNIVERSE_TARGETS:Narm64}
 universe: universe_arm64_skip .PHONY
 universe_epilogue: universe_arm64_skip .PHONY