diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-06-15 23:58:00 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-06-15 23:58:00 +0000 |
| commit | d00ea3e574b447595fa2962290c22eb060990413 (patch) | |
| tree | dddeb74c4214f66fe404c1d48a30cb4c7f0e9649 /Makefile | |
| parent | 9b42513fd187c60bad479d8cc4ff4b7ec4694845 (diff) | |
| download | FreeBSD-src-d00ea3e574b447595fa2962290c22eb060990413.zip FreeBSD-src-d00ea3e574b447595fa2962290c22eb060990413.tar.gz | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |
