d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tinderbox/universe: Only show arm64 warning if it was in the TARGETS list.

Browse Source 
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
This commit is contained in:
Bryan Drewery 2016-06-15 23:58:00 +00:00
parent 3ea2c169b4
commit d97607185a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -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