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

Don't add arm64 to universe builds if the user provided a TARGETS list

Browse Source 
Differential Revision:	https://reviews.freebsd.org/D2375
Reported by:	andrew
Reviewed by:	andrew, imp
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Ed Maste 2015-04-28 17:13:05 +00:00
parent e948489558
commit 504f34b362
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -373,19 +373,19 @@ 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)
TARGETS?=amd64 arm i386 mips pc98 powerpc sparc64
# XXX Add arm64 to universe only if we have an external binutils installed. # XXX Add arm64 to universe only if we have an external binutils installed.
# It does not build with the in-tree linker. # It does not build with the in-tree linker.
.if exists(/usr/local/aarch64-freebsd/bin/ld) .if exists(/usr/local/aarch64-freebsd/bin/ld)
TARGETS+=arm64 UNIVERSE_arm64=arm64
TARGET_ARCHES_arm64?= aarch64 .elif empty(${TARGETS})
.else
universe: universe_arm64_skip universe: universe_arm64_skip
universe_epilogue: universe_arm64_skip universe_epilogue: universe_arm64_skip
universe_arm64_skip: universe_prologue universe_arm64_skip: universe_prologue
@echo ">> arm64 skipped - install aarch64-binutils port or package to build" @echo ">> arm64 skipped - install aarch64-binutils port or package to build"
.endif .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_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