aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2016-06-15 23:58:00 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2016-06-15 23:58:00 +0000
commitd97607185a88881a10cca359d51b1bdf39331565 (patch)
treedddeb74c4214f66fe404c1d48a30cb4c7f0e9649 /Makefile
parent3ea2c169b4def61a1e36f1585bd5da1635d3441c (diff)
downloadsrc-d97607185a88881a10cca359d51b1bdf39331565.tar.gz
src-d97607185a88881a10cca359d51b1bdf39331565.zip
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
Notes
Notes: svn path=/head/; revision=301938
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1a1d885049ca..2238edbabc80 100644
--- a/Makefile
+++ b/Makefile
@@ -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