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

Rework r287900 to keep arm64/aarch64 stable in the TARGETS list.

Browse Source 
This is relevant for makeman using the 'make targets' output in src.conf(5).

This makes a _UNIVERSE_TARGETS that removes arm64 if the build
requirements are not met.
This commit is contained in:
bdrewery 2015-09-17 04:54:49 +00:00
parent 0981656a6d
commit c573883774
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Makefile
View File

@ -381,26 +381,27 @@ kernel-toolchains:
# existing system is. # existing system is.
# #
.if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets) .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets)
# XXX Add arm64 to universe only if we have an external binutils installed. TARGETS?=amd64 arm arm64 i386 mips pc98 powerpc sparc64
# It does not build with the in-tree linker. Added to lower .for loops too. _UNIVERSE_TARGETS= ${TARGETS}
.if exists(/usr/local/aarch64-freebsd/bin/ld)
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_arm?= arm armeb armv6 armv6hf
TARGET_ARCHES_arm64?= aarch64 TARGET_ARCHES_arm64?= aarch64
TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32
TARGET_ARCHES_powerpc?= powerpc powerpc64 TARGET_ARCHES_powerpc?= powerpc powerpc64
TARGET_ARCHES_pc98?= i386 TARGET_ARCHES_pc98?= i386
.for target in ${TARGETS} arm64 .for target in ${TARGETS}
TARGET_ARCHES_${target}?= ${target} TARGET_ARCHES_${target}?= ${target}
.endfor .endfor
# 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) && empty(${TARGETS})
_UNIVERSE_TARGETS:= ${_UNIVERSE_TARGETS:Narm64}
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
.if defined(UNIVERSE_TARGET) .if defined(UNIVERSE_TARGET)
MAKE_JUST_WORLDS= YES MAKE_JUST_WORLDS= YES
.else .else
@ -410,7 +411,7 @@ KERNSRCDIR?= ${.CURDIR}/sys
targets: .PHONY targets: .PHONY
@echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets" @echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets"
.for target in ${TARGETS} arm64 .for target in ${TARGETS}
.for target_arch in ${TARGET_ARCHES_${target}} .for target_arch in ${TARGET_ARCHES_${target}}
@echo " ${target}/${target_arch}" @echo " ${target}/${target_arch}"
.endfor .endfor
@ -432,7 +433,7 @@ universe_prologue:
.if defined(DOING_TINDERBOX) .if defined(DOING_TINDERBOX)
@rm -f ${FAILFILE} @rm -f ${FAILFILE}
.endif .endif
.for target in ${TARGETS} .for target in ${_UNIVERSE_TARGETS}
universe: universe_${target} universe: universe_${target}
universe_epilogue: universe_${target} universe_epilogue: universe_${target}
universe_${target}: universe_${target}_prologue universe_${target}: universe_${target}_prologue